From owner-svn-src-user@FreeBSD.ORG Thu Jan 6 04:38:10 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 7E756106566C;
Thu, 6 Jan 2011 04:38:10 +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 6F99D8FC12;
Thu, 6 Jan 2011 04:38:10 +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 p064cATb002519;
Thu, 6 Jan 2011 04:38:10 GMT
(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id p064cA4M002515;
Thu, 6 Jan 2011 04:38:10 GMT
(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101060438.p064cA4M002515@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 6 Jan 2011 04:38:10 +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: r217045 - in user/nwhitehorn/bsdinstall: . distextract
partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
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: Thu, 06 Jan 2011 04:38:10 -0000
Author: nwhitehorn
Date: Thu Jan 6 04:38:10 2011
New Revision: 217045
URL: http://svn.freebsd.org/changeset/base/217045
Log:
Improve error handling.
Modified:
user/nwhitehorn/bsdinstall/bsdinstall
user/nwhitehorn/bsdinstall/distextract/distextract.c
user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
Modified: user/nwhitehorn/bsdinstall/bsdinstall
==============================================================================
--- user/nwhitehorn/bsdinstall/bsdinstall Thu Jan 6 04:12:29 2011 (r217044)
+++ user/nwhitehorn/bsdinstall/bsdinstall Thu Jan 6 04:38:10 2011 (r217045)
@@ -8,5 +8,5 @@ BSDINSTALL_CHROOT="/mnt"; export BSDINST
VERB=$1
-$(dirname $0)/libexec/$VERB
+exec $(dirname $0)/libexec/$VERB
Modified: user/nwhitehorn/bsdinstall/distextract/distextract.c
==============================================================================
--- user/nwhitehorn/bsdinstall/distextract/distextract.c Thu Jan 6 04:12:29 2011 (r217044)
+++ user/nwhitehorn/bsdinstall/distextract/distextract.c Thu Jan 6 04:38:10 2011 (r217045)
@@ -165,6 +165,7 @@ extract_files(int nfiles, const char **f
archive_read_free(archive);
}
+ err = 0;
exit:
end_dialog();
Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Thu Jan 6 04:12:29 2011 (r217044)
+++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Thu Jan 6 04:38:10 2011 (r217045)
@@ -809,6 +809,8 @@ gpart_commit(struct gmesh *mesh)
}
LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
+ modified = "true"; /* XXX: If we don't know (kernel too old),
+ * assume there are modifications. */
LIST_FOREACH(gc, &gp->lg_config, lg_config) {
if (strcmp(gc->lg_name, "modified") == 0) {
modified = gc->lg_val;