rpms/mkinitrd/F-8 mkinitrd-dmdeps.patch, NONE, 1.1 mkinitrd-forceide.patch, NONE, 1.1 mkinitrd.spec, 1.225, 1.226

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23460

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-dmdeps.patch mkinitrd-forceide.patch 
Log Message:
- Work around dmraid dep detection during livecd install.
- Fix broken ide-disk.ko detection.


mkinitrd-dmdeps.patch:

--- NEW FILE mkinitrd-dmdeps.patch ---
diff -up mkinitrd-6.0.19/mkinitrd.dmraid mkinitrd-6.0.19/mkinitrd
--- mkinitrd-6.0.19/mkinitrd.dmraid	2007-10-30 12:46:39.000000000 -0400
+++ mkinitrd-6.0.19/mkinitrd	2007-10-30 12:49:48.000000000 -0400
@@ -504,6 +504,16 @@ findblockdevinsys() {
 findstoragedriverinsys () {
     while [ ! -L device ]; do
         [ "$PWD" = "/sys" ] && return
+        if [[ "$PWD" =~ "/sys/block/dm-" ]]; then
+            slaves="$PWD/slaves/*"
+            for slave in $slaves ; do
+                [ -e $slave ] || continue
+                realslave=$(readlink $slave)
+                qpushd $realslave
+                findstoragedriverinsys
+                qpopd
+            done
+        fi
         cd ..
     done
     cd $(readlink ./device)

mkinitrd-forceide.patch:

--- NEW FILE mkinitrd-forceide.patch ---
diff -up mkinitrd-6.0.19/mkinitrd.forceide mkinitrd-6.0.19/mkinitrd
--- mkinitrd-6.0.19/mkinitrd.forceide	2007-10-30 12:03:06.000000000 -0400
+++ mkinitrd-6.0.19/mkinitrd	2007-10-30 12:47:33.000000000 -0400
@@ -1124,7 +1124,7 @@ if [ -n "$forcescsi" -o -z "$noscsi" -a 
 fi
 
 # If we have ide devices and module ide, do the right thing
-ide=/proc/ide/ide*
+ide=$(ls /proc/ide/ide* 2>/dev/null)
 if [ -n "$forceide" -o -n "$ide" -a "x$PROBE" == "xyes" ]; then
     findmodule -ide-disk
 fi


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-8/mkinitrd.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- mkinitrd.spec	20 Oct 2007 04:26:06 -0000	1.225
+++ mkinitrd.spec	30 Oct 2007 17:00:04 -0000	1.226
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.19
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -29,7 +29,9 @@
 Requires: nash = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-root
 
-Patch: mkinitrd-ldso.patch
+Patch0: mkinitrd-ldso.patch
+Patch1: mkinitrd-forceide.patch
+Patch2: mkinitrd-dmdeps.patch
 
 %description
 mkinitrd creates filesystem images for use as initial ram filesystem
@@ -68,7 +70,9 @@
 
 %prep
 %setup -q -n mkinitrd-%{version}
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 make LIB=%{_lib}
@@ -116,6 +120,10 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Tue Oct 30 2007 Peter Jones <pjones at redhat.com> - 6.0.19-4
+- Work around dmraid dependency detection after livecd install.
+- Fix "ide-disk.ko" detection.
+
 * Sat Oct 20 2007 Bill Nottingham <notting at redhat.com> - 6.0.19-3
 - pull the right dynamic linker when multiple ones are present (#336161)