X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fybin;h=6feef555b25e71484242f73c3dfc51bcf6986c02;hp=046b6bd01f4d984ab281aa849ef92f402a81c661;hb=24679e706305e0910f181a9640b8b88a30662d03;hpb=a5b19d45fb5569f68e56445536296188b2ec0809

diff --git a/ybin/ybin b/ybin/ybin
index 046b6bd..6feef55 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -29,7 +29,7 @@ fi
 PRG="${0##*/}"
 ABSPRG="$0"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.13
+VERSION=1.3.14
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
@@ -436,21 +436,22 @@ checkconf()
     fi
 
     if [ "$nonvram" = 0 ] ; then
-	## see if nvsetenv exists and is executable
-	if (command -v nvsetenv > /dev/null 2>&1) ; then
-	    [ -x `command -v nvsetenv` ] || MISSING=1 ; else MISSING=1
+		## see if nvsetenv or nvram exists and is executable
+		for program in nvsetenv nvram ; do
+			if (command -v $program > /dev/null 2>&1) && [ -x `command -v $program` ] ; then
+				NVRAM_PROG=$program
+				break
+			fi
+		done
+		if [ -z "$NVRAM_PROG" ] ; then
+			nonvram=1
+			echo 1>&2 "$PRG: Warning: \`nvsetenv' and \`nvram' could not be found, nvram will not be updated"
+		fi
 	fi
 
 	if [ "$nonvram" = 0 ] ; then
 	    ## if nvsetenv exists see if its the old broken version
-	    if [ "$MISSING" != 1 ] ; then
-		nvsetenv --version > /dev/null 2>&1 || OLD=1
-	    else
-		nonvram=1
-		echo 1>&2 "$PRG: Warning: \`nvsetenv' could not be found, nvram will not be updated"
-	    fi
-
-	    if [ "$OLD" = 1 ] ; then
+		if [ "$NVRAM_PROG" = "nvsetenv" ] && ! nvsetenv --version > /dev/null 2>&1 ; then
 		## i check this myself to avoid misleading error
 		## messages. nvsetenv should REALLY support --version.
 		if [ ! -e /dev/nvram ] ; then
@@ -471,7 +472,7 @@ checkconf()
 		    nonvram=1
 		else
 		    nonvram=1
-		    echo 1>&2 "$PRG: Warning: Incompatible version of \`nvsetenv', nvram will not be updated"
+		    echo 1>&2 "$PRG: Warning: Incompatible version of nvsetenv, nvram will not be updated"
 		fi
 	    fi
 	fi
@@ -926,7 +927,11 @@ util_install()
 	if [ "$nonvram" = 0 ] ; then
 	    [ "$VERBOSE" = 1 ] && echo "$PRG: Updating OpenFirmware boot-device variable in nvram..."
 	    [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: boot-device=${ofboot},${OFFILE}"
-	    nvsetenv boot-device "${ofboot},${OFFILE}"
+		if [ "$NVRAM_PROG" = "nvsetenv" ] ; then
+			nvsetenv boot-device "${ofboot},${OFFILE}"
+		else
+			nvram -p common --update-config boot-device="${ofboot},${OFFILE}"
+		fi
 	    if [ $? != 0 ] ; then
 		echo 1>&2 "$PRG: An error occured while updating nvram, we'll ignore it"
 	    fi
@@ -1112,7 +1117,11 @@ mnt_install()
     if [ "$nonvram" = 0 ] ; then
 	[ "$VERBOSE" = 1 ] && echo "$PRG: Updating OpenFirmware boot-device variable in nvram..."
 	[ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: boot-device=${ofboot},${OFFILE}"
-	nvsetenv boot-device "${ofboot},${OFFILE}"
+	if [ "$NVRAM_PROG" = "nvsetenv" ] ; then
+		nvsetenv boot-device "${ofboot},${OFFILE}"
+	else
+		nvram -p common --update-config boot-device="${ofboot},${OFFILE}"
+	fi
 	if [ $? != 0 ] ; then
 	    echo 1>&2 "$PRG: An error occured while updating nvram, we'll ignore it"
 	fi