SOURCES: grubby-geninitrd.patch - rediff (merged chunks)

[glen]

Author: glen                         Date: Thu Feb  8 18:53:37 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- rediff (merged chunks)

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

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.3 SOURCES/grubby-geninitrd.patch:1.4
--- SOURCES/grubby-geninitrd.patch:1.3	Thu Feb  8 19:50:26 2007
+++ SOURCES/grubby-geninitrd.patch	Thu Feb  8 19:53:32 2007
@@ -1,6 +1,22 @@
---- mkinitrd-4.1.18/grubby/new-kernel-pkg	2005-01-05 23:14:45.000000000 +0200
-+++ mkinitrd-4.1.18/grubby/new-kernel-pkg	2005-01-06 00:43:51.000000000 +0200
-@@ -110,17 +110,10 @@
+--- mkinitrd-5.0.4/grubby/new-kernel-pkg~	2007-02-08 20:52:12.099247000 +0200
++++ mkinitrd-5.0.4/grubby/new-kernel-pkg	2007-02-08 20:52:35.604189764 +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,17 +115,10 @@
  	return
      fi
  
@@ -15,14 +31,14 @@
 -	if [ -z "$device" ]; then
 -	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
 -	fi
-+	find_root
++    find_root /etc/fstab || exit
 +    rootdevice=$rootdev
 +    if [ -z "$rootdevice" ]; then
 +		rootdevice=$(mount | awk '$3 == "/" { print $1 }')
      fi
  
-     if [ -n "$cfgGrub" ]; then
-@@ -199,10 +192,10 @@
+     if [ -n "$mbkernel" ]; then
+@@ -211,10 +206,10 @@
  
  mkinitrd() {
      [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
@@ -35,34 +51,7 @@
  	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 @@
+@@ -234,7 +229,6 @@
      [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
  }
  
================================================================

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