Module Name: src
Committed By: jmcneill
Date: Sat Oct 6 09:58:55 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
src/distrib/utils/embedded/files: resize_disklabel
Log Message:
resize_disklabel: if disk and partition is not specified, use
kern.root_device/kern.root_partition sysctls
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/files/resize_disklabel
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.28 src/distrib/utils/embedded/conf/evbarm.conf:1.29
--- src/distrib/utils/embedded/conf/evbarm.conf:1.28 Tue Jun 19 15:12:05 2018
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Oct 6 09:58:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.28 2018/06/19 15:12:05 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.29 2018/10/06 09:58:55 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -138,8 +138,6 @@ EOF
if $resize; then
cat >> ${mnt}/etc/rc.conf << EOF
resize_disklabel=YES
-resize_disklabel_disk=ld0
-resize_disklabel_part=a
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/utils/embedded/files/resize_disklabel
diff -u src/distrib/utils/embedded/files/resize_disklabel:1.2 src/distrib/utils/embedded/files/resize_disklabel:1.3
--- src/distrib/utils/embedded/files/resize_disklabel:1.2 Fri Apr 14 13:47:21 2017
+++ src/distrib/utils/embedded/files/resize_disklabel Sat Oct 6 09:58:55 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: resize_disklabel,v 1.2 2017/04/14 13:47:21 jmcneill Exp $
+# $NetBSD: resize_disklabel,v 1.3 2018/10/06 09:58:55 jmcneill Exp $
#
# PROVIDE: resize_disklabel
@@ -80,12 +80,10 @@ grow_disklabel()
resize_disklabel_start()
{
if [ x"${resize_disklabel_disk}" = "x" ]; then
- warn "\${resize_disklabel_disk} is not set, not resizing disklabel"
- return
+ resize_disklabel_disk="$(/sbin/sysctl -n kern.root_device)"
fi
if [ x"${resize_disklabel_part}" = "x" ]; then
- warn "\${resize_disklabel_part} is not set, not resizing disklabel"
- return
+ resize_disklabel_part=$(printf \\$(printf '%03o' $(( 97 + $(sysctl -n kern.root_partition) ))))
fi
grow_mbrpart "${resize_disklabel_disk}"
