From owner-freebsd-sysinstall@FreeBSD.ORG Sat Oct 8 15:00:12 2011 Return-Path: Delivered-To: freebsd-sysinstall@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44A0B1065729 for ; Sat, 8 Oct 2011 15:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CF80D8FC20 for ; Sat, 8 Oct 2011 15:00:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p98F0BoR072101 for ; Sat, 8 Oct 2011 15:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p98F0Bfr072087; Sat, 8 Oct 2011 15:00:11 GMT (envelope-from gnats) Date: Sat, 8 Oct 2011 15:00:11 GMT Message-Id: <201110081500.p98F0Bfr072087@freefall.freebsd.org> To: freebsd-sysinstall@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: bin/160931: commit references a PR X-BeenThere: freebsd-sysinstall@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Sysinstall Work List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 15:00:12 -0000 The following reply was made to PR bin/160931; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: bin/160931: commit references a PR Date: Sat, 8 Oct 2011 14:59:21 +0000 (UTC) Author: nwhitehorn Date: Sat Oct 8 14:59:12 2011 New Revision: 226160 URL: http://svn.freebsd.org/changeset/base/226160 Log: Usability enhancements: do not allow setting a mountpoint on bsdlabel container partitions, which didn't do anything anyway, and check for an existing freebsd-boot partition before bothering the user to make one. PR: bin/160931 MFC after: 3 days Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 13:01:38 2011 (r226159) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Oct 8 14:59:12 2011 (r226160) @@ -892,6 +892,19 @@ addpartform: goto addpartform; } + /* + * Error if this scheme needs nested partitions, this is one, and + * a mountpoint was set. + */ + if (strcmp(items[0].text, "freebsd") == 0 && + strlen(items[2].text) > 0) { + dialog_msgbox("Error", "Partitions of type \"freebsd\" are " + "nested BSD-type partition schemes and cannot have " + "mountpoints. After creating one, select it and press " + "Create again to add the actual file systems.", 0, 0, TRUE); + goto addpartform; + } + /* If this is the root partition, check that this scheme is bootable */ if (strcmp(items[2].text, "/") == 0 && !is_scheme_bootable(scheme)) { char message[512]; @@ -909,7 +922,23 @@ addpartform: * If this is the root partition, and we need a boot partition, ask * the user to add one. */ - if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0) { + + /* Check for existing freebsd-boot partition */ + LIST_FOREACH(pp, &geom->lg_provider, lg_provider) { + struct partition_metadata *md; + md = get_part_metadata(pp->lg_name, 0); + if (md == NULL || !md->bootcode) + continue; + LIST_FOREACH(gc, &pp->lg_config, lg_config) + if (strcmp(gc->lg_name, "type") == 0) + break; + if (gc != NULL && strcmp(gc->lg_val, "freebsd-boot") == 0) + break; + } + + /* If there isn't one, and we need one, ask */ + if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0 && + pp == NULL) { if (interactive) choice = dialog_yesno("Boot Partition", "This partition scheme requires a boot partition " _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"