SOURCES: grubby-geninitrd.patch - merged from -no-nash.patch

[glen]

Author: glen                         Date: Thu Feb  8 18:48:23 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from -no-nash.patch

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

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.1 SOURCES/grubby-geninitrd.patch:1.2
--- SOURCES/grubby-geninitrd.patch:1.1	Wed Jan  5 23:34:58 2005
+++ SOURCES/grubby-geninitrd.patch	Thu Feb  8 19:48:18 2007
@@ -1,6 +1,28 @@
---- mkinitrd-4.1.18/grubby/new-kernel-pkg~	2005-01-05 22:58:32.000000000 +0200
-+++ mkinitrd-4.1.18/grubby/new-kernel-pkg	2005-01-05 23:14:45.000000000 +0200
-@@ -199,10 +199,10 @@
+--- 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 @@
+ 	return
+     fi
+ 
+-    # get the root filesystem to use; if it's on a label make sure it's
+-    # been configured. if not, get the root device from mount
+-    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+-    short=$(echo $rootdevice | cut -d= -f1)
+-    if [ "$short" == "LABEL" ]; then
+-	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+-	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+-			awk '$2 == "'$label'" {print $1}')
+-	if [ -z "$device" ]; then
+-	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+-	fi
++	find_root
++    rootdevice=$rootdev
++    if [ -z "$rootdevice" ]; then
++		rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+     fi
+ 
+     if [ -n "$cfgGrub" ]; then
+@@ -199,10 +192,10 @@
  
  mkinitrd() {
      [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
================================================================

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