svn commit: r217045 - in user/nwhitehorn/bsdinstall: . distextract partedit

Nathan Whitehorn nwhitehorn at FreeBSD.org
Thu Jan 6 04:38:10 UTC 2011


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;


More information about the svn-src-user mailing list