From owner-svn-src-user@FreeBSD.ORG  Mon Jan  3 15:31:02 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 831C81065679;
	Mon,  3 Jan 2011 15:31:02 +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 726828FC1E;
	Mon,  3 Jan 2011 15:31:02 +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 p03FV2rV097007;
	Mon, 3 Jan 2011 15:31:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p03FV27W097005;
	Mon, 3 Jan 2011 15:31:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101031531.p03FV27W097005@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 3 Jan 2011 15:31:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216920 - user/nwhitehorn/bsdinstall/partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jan 2011 15:31:02 -0000

Author: nwhitehorn
Date: Mon Jan  3 15:31:02 2011
New Revision: 216920
URL: http://svn.freebsd.org/changeset/base/216920

Log:
  Allow partition mountpoints to be deleted.

Modified:
  user/nwhitehorn/bsdinstall/partedit/gpart_ops.c

Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Mon Jan  3 12:57:07 2011	(r216919)
+++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Mon Jan  3 15:31:02 2011	(r216920)
@@ -439,8 +439,18 @@ set_part_metadata(const char *name, cons
 	/* VTOC8 needs partcode in UFS partitions */
 	if (strcmp(scheme, "VTOC8") == 0 && strcmp(type, "freebsd-ufs") == 0)
 		md->bootcode = 1;
-	
-	if (mountpoint != NULL && mountpoint[0] != '\0') {
+
+	if (mountpoint == NULL || mountpoint[0] == '\0') {
+		if (md->fstab != NULL) {
+			free(md->fstab->fs_spec);
+			free(md->fstab->fs_file);
+			free(md->fstab->fs_vfstype);
+			free(md->fstab->fs_mntops);
+			free(md->fstab->fs_type);
+			free(md->fstab);
+			md->fstab = NULL;
+		}
+	} else {
 		if (md->fstab == NULL) {
 			md->fstab = malloc(sizeof(struct fstab));
 		} else {