From owner-svn-src-user@FreeBSD.ORG  Tue Jan 18 15:49: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 2DA2D106566B;
	Tue, 18 Jan 2011 15:49: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 1D1438FC2C;
	Tue, 18 Jan 2011 15:49: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 p0IFn2kG042746;
	Tue, 18 Jan 2011 15:49:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IFn2T8042744;
	Tue, 18 Jan 2011 15:49:02 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101181549.p0IFn2T8042744@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 18 Jan 2011 15:49:01 +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: r217541 - 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: Tue, 18 Jan 2011 15:49:02 -0000

Author: nwhitehorn
Date: Tue Jan 18 15:49:01 2011
New Revision: 217541
URL: http://svn.freebsd.org/changeset/base/217541

Log:
  Finish modifications to allow this to be used as a replacement for sade(8).

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

Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/partedit.c	Tue Jan 18 15:46:04 2011	(r217540)
+++ user/nwhitehorn/bsdinstall/partedit/partedit.c	Tue Jan 18 15:49:01 2011	(r217541)
@@ -204,6 +204,7 @@ apply_changes(struct gmesh *mesh)
 	char message[512];
 	int i, nitems, error;
 	const char **items;
+	const char *fstab_path;
 	FILE *fstab;
 
 	nitems = 1; /* Partition table changes */
@@ -259,7 +260,11 @@ apply_changes(struct gmesh *mesh)
 		free(__DECONST(char *, items[i*2]));
 	free(items);
 
-	fstab = fopen(getenv("PATH_FSTAB"), "w+");
+	if (getenv("PATH_FSTAB") != NULL)
+		fstab_path = getenv("PATH_FSTAB");
+	else
+		fstab_path = "/etc/fstab";
+	fstab = fopen(fstab_path, "w+");
 	if (fstab == NULL) {
 		sprintf(message, "Cannot open fstab file %s for writing (%s)\n",
 		    getenv("PATH_FSTAB"), strerror(errno));