From owner-svn-src-all@FreeBSD.ORG  Sat Feb 19 14:49:49 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78C07106564A;
	Sat, 19 Feb 2011 14:49:49 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 680B28FC14;
	Sat, 19 Feb 2011 14:49:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1JEnnpl099373;
	Sat, 19 Feb 2011 14:49:49 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1JEnn2v099371;
	Sat, 19 Feb 2011 14:49:49 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201102191449.p1JEnn2v099371@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 19 Feb 2011 14:49:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218853 - head/usr.sbin/bsdinstall/partedit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Feb 2011 14:49:49 -0000

Author: nwhitehorn
Date: Sat Feb 19 14:49:49 2011
New Revision: 218853
URL: http://svn.freebsd.org/changeset/base/218853

Log:
  The PC98 gpart module supports labels now.

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 Feb 19 14:27:14 2011	(r218852)
+++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c	Sat Feb 19 14:49:49 2011	(r218853)
@@ -65,6 +65,19 @@ gpart_show_error(const char *title, cons
 	dialog_msgbox(title, message, 0, 0, TRUE);
 }
 
+static int
+scheme_supports_labels(const char *scheme)
+{
+	if (strcmp(scheme, "APM") == 0)
+		return (1);
+	if (strcmp(scheme, "GPT") == 0)
+		return (1);
+	if (strcmp(scheme, "PC98") == 0)
+		return (1);
+
+	return (0);
+}
+
 int
 gpart_partition(const char *lg_name, const char *scheme)
 {
@@ -389,11 +402,7 @@ gpart_edit(struct gprovider *pp)
 		}
 	}
 
-	/* Labels only supported on GPT and APM */
-	if (strcmp(scheme, "GPT") == 0 || strcmp(scheme, "APM") == 0)
-		nitems = 4;
-	else
-		nitems = 3;
+	nitems = scheme_supports_labels(scheme) ? 4 : 3;
 
 	/* Edit editable parameters of a partition */
 	hadlabel = 0;
@@ -738,11 +747,7 @@ gpart_create(struct gprovider *pp, char 
 	if (strcmp(scheme, "MBR") == 0 || strcmp(scheme, "PC98") == 0)
 		items[0].text = "freebsd";
 
-	/* Labels only supported on GPT and APM */
-	if (strcmp(scheme, "GPT") == 0 || strcmp(scheme, "APM") == 0)
-		nitems = 4;
-	else
-		nitems = 3;
+	nitems = scheme_supports_labels(scheme) ? 4 : 3;
 
 	if (default_type != NULL)
 		items[0].text = default_type;