SOURCES: grubby-geninitrd.patch - use findroot from geninitrd expo...

[glen]

Author: glen                         Date: Thu Feb  8 18:50:31 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use findroot from geninitrd exported functions

---- Files affected:
SOURCES:
   grubby-geninitrd.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.2 SOURCES/grubby-geninitrd.patch:1.3
--- SOURCES/grubby-geninitrd.patch:1.2	Thu Feb  8 19:48:18 2007
+++ SOURCES/grubby-geninitrd.patch	Thu Feb  8 19:50:26 2007
@@ -35,3 +35,38 @@
  	exit 1
      fi
  }
+--- mkinitrd-5.0.4/grubby/new-kernel-pkg~	2007-02-08 20:47:17.087419916 +0200
++++ mkinitrd-5.0.4/grubby/new-kernel-pkg	2007-02-08 20:39:31.000000000 +0200
+@@ -10,6 +10,7 @@
+ # 
+ 
+ PATH=/sbin:/bin:$PATH
++PROGRAM=${0##*/}
+ 
+ lilo=/sbin/lilo
+ 
+@@ -23,6 +24,7 @@
+ fi
+ 
+ [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
++. /etc/geninitrd/functions
+ 
+ cfgGrub=""
+ cfgLilo=""
+@@ -113,7 +116,7 @@
+ 	return
+     fi
+ 
+-	find_root
++    find_root /etc/fstab || exit
+     rootdevice=$rootdev
+     if [ -z "$rootdevice" ]; then
+ 		rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+@@ -227,7 +230,6 @@
+     [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+ }
+ 
+-
+ while [ $# -gt 0 ]; do
+     case $1 in
+ 	--mkinitrd)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/grubby-geninitrd.patch?r1=1.2&r2=1.3&f=u