Module Name:    src
Committed By:   jmcneill
Date:           Mon Apr  6 22:40:09 UTC 2015

Modified Files:
        src/etc/rc.d: resize_root

Log Message:
add KEYWORD: interactive, honour resize_root_flags and resize_root_postcmd rc 
vars


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/resize_root

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/resize_root
diff -u src/etc/rc.d/resize_root:1.1 src/etc/rc.d/resize_root:1.2
--- src/etc/rc.d/resize_root:1.1	Mon Mar 30 10:58:37 2015
+++ src/etc/rc.d/resize_root	Mon Apr  6 22:40:09 2015
@@ -1,10 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: resize_root,v 1.1 2015/03/30 10:58:37 chopps Exp $
+# $NetBSD: resize_root,v 1.2 2015/04/06 22:40:09 jmcneill Exp $
 #
 
 # PROVIDE: resize_root
 # REQUIRE: fsck_root
+# KEYWORD: interactive
 
 $_rc_subr_loaded . /etc/rc.subr
 
@@ -81,10 +82,13 @@ resize_root_start()
 
 	if resize_ffs -c $rootdev; then
 		echo "Resizing $rootmp"
-		if ! resize_ffs -y $rootdev; then
+		if ! resize_ffs -p $resize_root_flags $rootdev; then
 		    echo "Error resizing root."
 		    stop_boot
 		fi
+		if [ ! -z "${resize_root_postcmd}" ]; then
+			${resize_root_postcmd}
+		fi
 	else
 		echo "Not resizing $rootmp: already correct size"
 	fi

Reply via email to