SOURCES: grubby-geninitrd.patch - forgot to commit

[patrys]

Author: patrys                       Date: Tue Dec 18 09:09:55 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- forgot to commit

---- Files affected:
SOURCES:
   grubby-geninitrd.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.5 SOURCES/grubby-geninitrd.patch:1.6
--- SOURCES/grubby-geninitrd.patch:1.5	Thu Feb  8 20:00:55 2007
+++ SOURCES/grubby-geninitrd.patch	Tue Dec 18 10:09:50 2007
@@ -22,7 +22,7 @@
  
  cfgGrub=""
  cfgLilo=""
-@@ -113,17 +115,10 @@
+@@ -113,15 +115,10 @@
  	return
      fi
  
@@ -30,10 +30,8 @@
 -    # 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 [ "$short" == "LABEL" -o "$short" == "UUID" ]; then
+-	device=$(echo resolveDevice "$rootdevice" | /sbin/nash  --forcequiet)
 -	if [ -z "$device" ]; then
 -	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
 -	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grubby-geninitrd.patch?r1=1.5&r2=1.6&f=u