ybin --bootonce doesn't work

[yaboot.git] / ybin / ybin

diff --git a/ybin/ybin b/ybin/ybin
index 046b6bd01f4d984ab281aa849ef92f402a81c661..d8836225720331ee11c0fd8069c1afba8c0d7a7a 100755 (executable)
--- 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}"
@@ -1152,6 +1152,7 @@ raw_install()
     fi
     sync ; sync
     [ "$VERBOSE" = 1 ] && echo "$PRG: Installation successful"
+    return 0
 }
 
 ## make sure the first stage ofboot generator is compatible.
@@ -1658,14 +1659,15 @@ checkconf || exit 1
 
 if [ "x$bootonce" != "x" ]; then
     foundlabel=`sed s/\#.*// $bootconf | grep "label=$bootonce$" | wc -l`
-    if [ "$nonvram" = 0 ]; then
+    if [ "$nonvram" = 1 ]; 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
+       if [ "$foundlabel" != "boot-once=$bootonce" -a \
+             "$foundlabel" != "$bootonce" ]; then
            echo 1>&2 "$PRG: Could not nvsetenv boot-once $bootonce"
            exit 1
        fi