SOURCES (AC-branch): grubby-geninitrd.patch - update to newer geninitrd

glen glen at pld-linux.org
Tue Mar 10 14:20:29 CET 2009


Author: glen                         Date: Tue Mar 10 13:20:29 2009 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- update to newer geninitrd

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

---- Diffs:

================================================================
Index: SOURCES/grubby-geninitrd.patch
diff -u SOURCES/grubby-geninitrd.patch:1.5 SOURCES/grubby-geninitrd.patch:1.5.2.1
--- SOURCES/grubby-geninitrd.patch:1.5	Thu Feb  8 20:00:55 2007
+++ SOURCES/grubby-geninitrd.patch	Tue Mar 10 14:20:23 2009
@@ -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-5.0.4/grubby/new-kernel-pkg	2007-02-08 21:00:08.938393556 +0200
++++ mkinitrd-5.0.4/grubby/new-kernel-pkg	2009-03-10 01:19:29.513298162 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -14,15 +14,7 @@
  
  lilo=/sbin/lilo
  
-@@ -23,6 +24,7 @@
- fi
- 
- [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-+. /etc/geninitrd/functions
- 
- cfgGrub=""
- cfgLilo=""
-@@ -113,17 +115,10 @@
+@@ -113,17 +114,11 @@
  	return
      fi
  
@@ -37,6 +29,7 @@
 -	if [ -z "$device" ]; then
 -	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
 -	fi
++	. /lib/geninitrd/functions
 +    find_root /etc/fstab || exit
 +    rootdevice=$rootdev
 +    if [ -z "$rootdevice" ]; then
================================================================

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



More information about the pld-cvs-commit mailing list