rpms/yaboot/devel yaboot-1.3.13-yabootconfig.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19208

Modified Files:
	yaboot-1.3.13-yabootconfig.patch 
Log Message:
fixup

yaboot-1.3.13-yabootconfig.patch:
 yabootconfig |  189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 176 insertions(+), 13 deletions(-)

Index: yaboot-1.3.13-yabootconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-yabootconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-yabootconfig.patch	25 Jul 2005 15:50:54 -0000	1.1
+++ yaboot-1.3.13-yabootconfig.patch	25 Jul 2005 20:28:32 -0000	1.2
@@ -1,5 +1,5 @@
---- yaboot-1.3.10/ybin/yabootconfig.yabootconfig	2003-02-08 23:53:46.000000000 -0500
-+++ yaboot-1.3.10/ybin/yabootconfig	2003-04-28 18:13:16.000000000 -0400
+--- yaboot-1.3.13/ybin/yabootconfig.yabootconfig	2005-07-25 16:09:39.000000000 -0400
++++ yaboot-1.3.13/ybin/yabootconfig	2005-07-25 16:25:03.000000000 -0400
 @@ -34,6 +34,7 @@
  NOINSTALL=0
  QUIET=0
@@ -8,7 +8,7 @@
  SIGINT="$PRG: Interrupt caught ... exiting"
  export LC_COLLATE=C
  
-@@ -309,6 +310,16 @@
+@@ -319,6 +320,16 @@
                      exit 1
                  fi
  		;;
@@ -25,7 +25,7 @@
  	    --kernel-args)
                  if [ -n "$2" ] ; then
                      KERNARGS="$2"
-@@ -327,10 +338,88 @@
+@@ -347,10 +358,88 @@
  		NOINSTALL=1
  		shift 1
  		;;
@@ -114,7 +114,7 @@
              "")
                  break
                  ;;
-@@ -439,7 +528,9 @@
+@@ -474,7 +563,9 @@
  
  ## find the kernel in the usual places and (if not --quiet) ask the
  ## user if we cannot find one.
@@ -123,9 +123,9 @@
 +    KERNEL="${CHROOT}${KERNELIMAGE}"
 +elif [ -f "${CHROOT}vmlinux" ] ; then
      KERNEL="${CHROOT}vmlinux"
- elif [ -f "${CHROOT}boot/vmlinux" ] ; then
-     KERNEL="${CHROOT}boot/vmlinux"
-@@ -565,6 +656,36 @@
+     if [ -f "${CHROOT}initrd" ] ; then
+ 	INITRD="${CHROOT}initrd"
+@@ -721,6 +812,36 @@
      HEADER="## see also: /usr/share/doc/yaboot/examples for example configurations.\n"
  fi
  
@@ -162,7 +162,7 @@
  ## setup append line
  if [ -n "$KERNARGS" ] ; then
      APPEND="\tappend=\"${KERNARGS}\"\n"
-@@ -579,24 +700,64 @@
+@@ -740,24 +861,64 @@
      INITRDIMGS="\tinitrd=$INITRDIMG\n\tinitrd-size=8192\n"
  fi
  
@@ -171,7 +171,7 @@
 +   if [ "$DEFOS" = "macosx" ] ; then
 +       DEFAULTOS="defaultos=${DEFOS}\n"
 +   elif [ "$DEFOS" = "macos" ] ; then
-+	 DEFAULTOS="defaultos=${DEFOS}\n"
++        DEFAULTOS="defaultos=${DEFOS}\n"
 +   elif [ "$DEFOS" = "darwin" ] ; then
 +         DEFAULTOS="defaultos=${DEFOS}\n"
 +   else
@@ -216,10 +216,10 @@
  IMAGES="
  image=$IMAGE
 -\tlabel=Linux
--\tread-only\n${APPEND:-}"
+-\tread-only\n${APPEND:-}${INITRDIMGS:-}"
 +\tlabel=$LABEL
 +\troot=$ROOT
-+\tread-only
++\tread-only\n
 +${INITRDLINE-}${APPEND:-}"
 +
 +if [ -n "$MACOSXDEV" ] ; then
@@ -238,7 +238,7 @@
  
  ## safely create a tmp file then move it into place after we are sure
  ## it was written.
-@@ -606,7 +767,9 @@
+@@ -767,7 +928,9 @@
      exit 1
  fi