rpms/mkinitrd/devel mkinitrd-6.0.9-mdadm.patch, NONE, 1.1 mkinitrd.spec, 1.199, 1.200

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/mkinitrd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19387

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-6.0.9-mdadm.patch 
Log Message:
- add patch to use mdadm instead of raidautorun


mkinitrd-6.0.9-mdadm.patch:

--- NEW FILE mkinitrd-6.0.9-mdadm.patch ---
--- mkinitrd.orig	2007-04-16 17:55:39.000000000 -0400
+++ mkinitrd	2007-05-09 18:22:18.000000000 -0400
@@ -1273,6 +1273,13 @@
     mknod $MNTIMAGE/dev/efirtc c 10 136
 fi
 
+if [ -n "$raiddevices" ]; then
+    inst /sbin/mdadm.static "$MNTIMAGE/bin/mdadm"
+    if [ -f /etc/mdadm.conf ]; then
+        cp $verbose /etc/mdadm.conf "$MNTIMAGE/etc/mdadm.conf"
+    fi
+fi
+
 # FIXME -- this can really go poorly with clvm or duplicate vg names.
 # nash should do lvm probing for us and write its own configs.
 if [ -n "$vg_list" ]; then
@@ -1430,8 +1437,7 @@
 
 if [ -n "$raiddevices" ]; then
     for dev in $raiddevices; do
-        cp -a /dev/${dev} $MNTIMAGE/dev
-        emit "raidautorun /dev/${dev}"
+        emit "mdadm -As --auto=yes --run /dev/${dev}"
     done
 fi
 


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- mkinitrd.spec	16 Apr 2007 22:19:16 -0000	1.199
+++ mkinitrd.spec	10 May 2007 15:40:03 -0000	1.200
@@ -3,10 +3,11 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
+Patch0: mkinitrd-6.0.9-mdadm.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q -n mkinitrd-%{version}
+%patch0 -p0 -b .mdadm
 
 %build
 make LIB=%{_lib}
@@ -111,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Thu May 10 2007 Peter Jones <pjones at redhat.com> - 6.0.9-2
+- Use mdadm not raidautorun so that newer metadata is supported (#213586)
+
 * Mon Apr 16 2007 Peter Jones <pjones at redhat.com> - 6.0.9-1
 - Use scsi_wait_scan.ko with scsi storage modules (#220470)
 - Fix handling of config files with no 'default' line in grubby