rpms/yaboot/F-10 yaboot-1.3.14-bigger-max-token.patch, NONE, 1.1 yaboot-1.3.14-fix-bootonce-nvram.patch, NONE, 1.1

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/yaboot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12398

Added Files:
	yaboot-1.3.14-bigger-max-token.patch 
	yaboot-1.3.14-fix-bootonce-nvram.patch 
Log Message:
oops, missing patches

yaboot-1.3.14-bigger-max-token.patch:

--- NEW FILE yaboot-1.3.14-bigger-max-token.patch ---
diff -up yaboot-1.3.14/second/cfg.c.bigger-max-token yaboot-1.3.14/second/cfg.c
--- yaboot-1.3.14/second/cfg.c.bigger-max-token	2008-11-12 14:39:11.000000000 -0500
+++ yaboot-1.3.14/second/cfg.c	2008-11-12 14:39:17.000000000 -0500
@@ -41,7 +41,7 @@ typedef struct {
      void *data;
 } CONFIG;
 
-#define MAX_TOKEN 200
+#define MAX_TOKEN 511
 #define MAX_VAR_NAME MAX_TOKEN
 #define EOF -1
 

yaboot-1.3.14-fix-bootonce-nvram.patch:

--- NEW FILE yaboot-1.3.14-fix-bootonce-nvram.patch ---
diff -up yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram yaboot-1.3.14/ybin/ybin
--- yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram	2008-11-12 14:51:28.000000000 -0500
+++ yaboot-1.3.14/ybin/ybin	2008-11-13 12:15:21.000000000 -0500
@@ -1689,14 +1689,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