Module Name:    src
Committed By:   jmcneill
Date:           Sun May 24 14:43:19 UTC 2020

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

Log Message:
Support resizing wedges


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/etc/rc.d/resize_root:1.5
--- src/etc/rc.d/resize_root:1.4	Sat Oct  6 13:09:53 2018
+++ src/etc/rc.d/resize_root	Sun May 24 14:43:19 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: resize_root,v 1.4 2018/10/06 13:09:53 jmcneill Exp $
+# $NetBSD: resize_root,v 1.5 2020/05/24 14:43:19 jmcneill Exp $
 #
 
 # PROVIDE: resize_root
@@ -72,7 +72,7 @@ resize_root_start()
 			fi
 		done
 
-		rootdev=${fs_spec%/*}/r${fs_spec##*/}
+		rootdev=${fs_spec}
 		break
 	done < "${fstab_file}"
 
@@ -81,8 +81,8 @@ resize_root_start()
 		return
 	fi
 
-	if resize_ffs -c $rootdev; then
-		echo "Resizing $rootmp"
+	if resize_ffs -c "$rootdev"; then
+		echo "Resizing $rootmp ($rootdev)"
 		if ! resize_ffs -y $resize_root_flags $rootdev; then
 		    echo "Error resizing root."
 		    stop_boot
@@ -91,7 +91,7 @@ resize_root_start()
 			${resize_root_postcmd}
 		fi
 	else
-		echo "Not resizing $rootmp: already correct size"
+		echo "Not resizing $rootmp ($rootdev): already correct size"
 	fi
 	return
 }

Reply via email to