SOURCES: grubby-geninitrd.patch - my patch :)

[glen]

Author: glen                         Date: Tue Dec 18 09:19:43 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- my patch :)

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

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.6 SOURCES/grubby-geninitrd.patch:1.7
--- SOURCES/grubby-geninitrd.patch:1.6	Tue Dec 18 10:09:50 2007
+++ SOURCES/grubby-geninitrd.patch	Tue Dec 18 10:19:38 2007
@@ -1,5 +1,5 @@
---- mkinitrd-5.0.4/grubby/new-kernel-pkg	2007-02-08 20:52:35.604189764 +0200
-+++ mkinitrd-5.0.4/grubby/new-kernel-pkg	2007-02-08 21:00:08.938393556 +0200
+--- mkinitrd-6.0.9/grubby/new-kernel-pkg~	2007-12-15 17:35:33.000000000 +0200
++++ mkinitrd-6.0.9/grubby/new-kernel-pkg	2007-12-15 17:41:08.258802271 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -22,7 +22,7 @@
  
  cfgGrub=""
  cfgLilo=""
-@@ -113,15 +115,10 @@
+@@ -116,15 +116,11 @@
  	return
      fi
  
@@ -35,13 +35,14 @@
 -	if [ -z "$device" ]; then
 -	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
 -	fi
++    # get the root filesystem to use
 +    find_root /etc/fstab || exit
 +    rootdevice=$rootdev
 +    if [ -z "$rootdevice" ]; then
-+		rootdevice=$(mount | awk '$3 == "/" { print $1 }')
++	rootdevice=$(mount | awk '$3 == "/" { print $1 }')
      fi
  
-     if [ -n "$mbkernel" ]; then
+     if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then
 @@ -211,10 +206,10 @@
  
  mkinitrd() {
================================================================

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