X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fybin;h=379b94b912593e4f9eff6e61c90df59c9dbc98c9;hp=bccd2d82f89ff6aed2265bca321f6d15616319da;hb=082b8310e3f92ea8da0b7011549bd86c9fd4ce95;hpb=ca58ccca8abb692653406eec7a414ffc985d6378

diff --git a/ybin/ybin b/ybin/ybin
index bccd2d8..379b94b 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -27,8 +27,9 @@ if [ -n "$PATH_PREFIX" ] ; then
     PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin"
 fi
 PRG="${0##*/}"
+ABSPRG="$0"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.9-UNRELEASED
+VERSION=1.3.14
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
@@ -62,7 +63,7 @@ fi
 ## define default configuration
 boot=unconfigured
 
-## allow default to work on packaged and non-packaged yaboot. 
+## allow default to work on packaged and non-packaged yaboot.
 ## no default for magicboot since it is not required everywhere.
 if [ -f /usr/local/lib/yaboot/yaboot ] ; then
     install=/usr/local/lib/yaboot/yaboot
@@ -123,7 +124,7 @@ fi
 
 ## make fake `id' if its missing, outputs 0 since if its missing we
 ## are probably running on boot floppies and thus are root.
-if (command -v id > /dev/null 2>&1) ; then 
+if (command -v id > /dev/null 2>&1) ; then
     true
 else
     id()
@@ -154,6 +155,8 @@ Update/install bootloader onto a bootstrap partition.
   -b, --boot                 set bootstrap partition device [ -b /dev/hda2 ]
   -o, --ofboot               set bootstrap partition OpenFirmware device
 			       default: automatically determined [ -o hd:2 ]
+       --bootonce            override default boot label for ONLY next boot
+                                eg: --bootonce linux-2.6.20-testing
   -i, --install              pathname to the actual bootloader binary
                                default: /usr/{local/}lib/yaboot/yaboot same as
                                install= in config file [ -i bootloader_file ]
@@ -299,7 +302,7 @@ checkconf()
 	    fi
 	    local CONFERR=1
 	fi
-	
+
 	if [ `echo ${#hfscreator}` != 4 ] ; then
 	    if [ "$ARGCT" = 1 ] ; then
 		echo 1>&2 "$PRG: --creator must be 4 characters"
@@ -385,7 +388,7 @@ checkconf()
 	fi
 
 	## convert defaultos variable
-	case "$defaultos" in 
+	case "$defaultos" in
 	    linux|Linux|GNU|Gnu|gnu)
 		defaultos=bootyaboot
 		;;
@@ -462,6 +465,10 @@ checkconf()
 		    echo 1>&2 "$PRG: /dev/nvram: Permission denied"
 		    echo 1>&2 "$PRG: Warning: nvram will not be updated"
 		    nonvram=1
+		elif ! (dd if=/dev/nvram of=/dev/null bs=1 count=10 > /dev/null 2>&1) ; then
+		    echo 1>&2 "$PRG: /dev/nvram: No such device"
+		    echo 1>&2 "$PRG: Warning: nvram will not be updated"
+		    nonvram=1
 		else
 		    nonvram=1
 		    echo 1>&2 "$PRG: Warning: Incompatible version of \`nvsetenv', nvram will not be updated"
@@ -723,7 +730,7 @@ checkhfsutils()
 
 ## This is gross, IBM CHRP OF needs a .note added to the yaboot
 ## binary, nobody knows whether this note will affect PowerMac OF or
-## not (or could in the future). 
+## not (or could in the future).
 hack_yaboot()
 {
     local YBDIR="${install%/*}"
@@ -785,7 +792,7 @@ util_install()
 
     ## repoint magicboot as the real first stage loader if using the
     ## modern automatic generating ofboot.b.
-    if [ -n "$FIRST" ] ; then	
+    if [ -n "$FIRST" ] ; then
 	magicboot="$FIRST"
 	[ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: set magicboot to $FIRST"
     fi
@@ -799,7 +806,7 @@ util_install()
 	if [ "$protect" = yes ] ; then
 	    local LOCK="+l"
 	fi
-	
+
 	if [ "$hide" = yes ] ; then
 	    local INVISIBLE="+i"
 	fi
@@ -1003,7 +1010,7 @@ umnt()
 mnt_install()
 {
     local BTFILE=yaboot
-  
+
     ## msdosfs is broken, yaboot may not support this filename.
     if [ "$fstype" = msdos ] ; then
 	local CFFILE=yaboot.cnf
@@ -1117,7 +1124,7 @@ mnt_install()
 }
 
 ## raw installation, for IBM RS/6000 hardware, yaboot is dded to the
-## bootstrap partition. 
+## bootstrap partition.
 raw_install()
 {
     ## make sure the device is not mounted as a filesystem before
@@ -1239,7 +1246,7 @@ mkoffs()
 	    [ "$VERBOSE" = 1 ] && echo "$PRG: Creating DOS filesystem on $boot..."
             if (command -v dd > /dev/null 2>&1) ; then
                 dd if=/dev/zero of="$boot" bs=512 count=1600 > /dev/null 2>&1
-            fi  
+            fi
 	    mkdosfs -n bootstrap "$boot" > /dev/null
             if [ $? != 0 ] ; then
 		echo 1>&2 "$PRG: DOS filesystem creation failed!"
@@ -1321,7 +1328,7 @@ cleanup()
 ## absurdly bloated case statement to parse command line options.
 if [ $# != 0 ] ; then
     while true ; do
-	case "$1" in 
+	case "$1" in
 	    -V|--version)
 		version
 		exit 0
@@ -1332,19 +1339,26 @@ if [ $# != 0 ] ; then
 		;;
 	    --debug)
 		DEBUG=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    -v|--verbose)
 		VERBOSE=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    -f|--force)
 		FORCE=yes
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    -b|--boot)
 		if [ -n "$2" ] ; then
-		    boot="$2"
+		    if [ "$boot" = "unconfigured" ]; then
+			boot="$2"
+		    else
+			boot="$boot $2"
+		    fi
 		    ARGBT=1
 		    shift 2
 		else
@@ -1357,6 +1371,18 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    ofboot="$2"
 		    ARGOB=1
+		    ARGS="$ARGS $1 $2"
+		    shift 2
+		else
+		    echo 1>&2 "$PRG: option requires an argument $1"
+		    echo 1>&2 "Try \`$PRG --help' for more information."
+		    exit 1
+		fi
+		;;
+	    --bootonce)
+		if [ -n "$2" ] ; then
+		    bootonce="$2"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1368,6 +1394,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    install="$2"
 		    ARGBF=1
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1380,6 +1407,7 @@ if [ $# != 0 ] ; then
 		    CONF="$2"
 		    bootconf="$2"
 		    ERR=" Error in $CONF:"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1391,6 +1419,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    magicboot="$2"
 		    ARGWP=1
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1402,6 +1431,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    fstype="$2"
 		    ARGFS=1
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1412,26 +1442,31 @@ if [ $# != 0 ] ; then
 	    --nobless)
 		bless=no
 		ARGBS=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    -M|--mount)
 		usemount=yes
 		ARGMT=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    --protect)
 		protect=yes
 		ARGPT=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    --hide)
 		hide=yes
 		ARGHD=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    --nonvram)
 		nonvram=1
 		ARGNV=1
+		ARGS="$ARGS $1"
 		shift
 		;;
 	    --device)
@@ -1439,6 +1474,7 @@ if [ $# != 0 ] ; then
 		    device="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1451,6 +1487,7 @@ if [ $# != 0 ] ; then
 		    timeout="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1463,6 +1500,7 @@ if [ $# != 0 ] ; then
 		    image="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1475,6 +1513,7 @@ if [ $# != 0 ] ; then
 		    label="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1487,6 +1526,7 @@ if [ $# != 0 ] ; then
 		    partition="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1499,6 +1539,7 @@ if [ $# != 0 ] ; then
 		    root="$2"
 		    bootconf=auto
 		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
+		    ARGS="$ARGS $1 $2"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1578,6 +1619,20 @@ fi
 [ $(parseconf flag enableofboot) = 0 ] && of=yes
 [ $(parseconf flag brokenosx) = 0 ] && brokenosx=yes
 
+bootparts=0
+for i in $boot; do
+    bootparts=$(($bootparts + 1))
+done
+if [ "$bootparts" -gt 1 ]; then
+    [ "$VERBOSE" = 1 ] && echo "$PRG: Iterating through list of boot partitions..."
+    rc=0
+    for i in $boot; do
+        [ "$VERBOSE" = 1 ] && echo "$ABSPRG $ARGS -b $i"
+        $ABSPRG $ARGS -b $i || rc=$?
+    done
+    exit $rc
+fi
+
 ## ffs!! rtfm! foad!
 if [ "$boot" = unconfigured ] ; then
     echo 1>&2 "$PRG: You must specify the device for the bootstrap partition. (ie: boot=/dev/hdaX)"
@@ -1601,6 +1656,28 @@ fi
 ## validate configuration for sanity.
 checkconf || exit 1
 
+if [ "x$bootonce" != "x" ]; then
+    foundlabel=`sed s/\#.*// $bootconf | grep "label=$bootonce$" | wc -l`
+    if [ "$nonvram" = 0 ]; then
+	echo 1>&2 "$PRG: --bootonce specified, but nvsetenv not available."
+	exit 1
+    fi
+    if [ "$foundlabel" = 1 ]; then
+	nvsetenv boot-once "$bootonce"
+	foundlabel=`nvsetenv boot-once`
+	if [ "$foundlabel" != "boot-once=$bootonce" ]; then
+	    echo 1>&2 "$PRG: Could not nvsetenv boot-once $bootonce"
+	    exit 1
+	fi
+	[ "$VERBOSE" = 1 ] && echo "$PRG: nvsetenv boot-once $bootonce"
+    else
+	echo 1>&2 "$PRG: Could not find bootonce label [$bootonce] in $bootconf"
+	exit 1
+    fi
+fi
+
+bootparts=0
+
 ## check that we can use ofpath, its only needed for magicboot script
 ## building and nvram updates.
 if [ -n "$magicboot" -o "$nonvram" = 0 ] ; then