rpms/mkinitrd/devel mkinitrd-6.0.9-lstat.patch, NONE, 1.1 mkinitrd-6.0.9-mdadm.patch, 1.2, 1.3 mkinitrd.spec, 1.203, 1.204

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	mkinitrd-6.0.9-mdadm.patch mkinitrd.spec 
Added Files:
	mkinitrd-6.0.9-lstat.patch 
Log Message:
- bring this up to the same level as the one I just built for updates-testing


mkinitrd-6.0.9-lstat.patch:

--- NEW FILE mkinitrd-6.0.9-lstat.patch ---
--- mkinitrd-6.0.9/nash/block.c.lstat	2007-06-07 11:19:14.000000000 -0400
+++ mkinitrd-6.0.9/nash/block.c	2007-06-07 11:19:18.000000000 -0400
@@ -419,7 +419,7 @@ nashBdevIterNext(nashBdevIter iter, nash
             }
 
             asprintf(&name, "%s/%s", iter->dirname, iter->dent->d_name);
-            if (lstat(name, &sb) >= 0 && S_ISDIR(sb.st_mode)) {
+            if (stat(name, &sb) >= 0 && S_ISDIR(sb.st_mode)) {
                 nashBdevIter newiter = nashBdevIterNew(iter->nc, name);
 
                 if (newiter != NULL) {

mkinitrd-6.0.9-mdadm.patch:

Index: mkinitrd-6.0.9-mdadm.patch
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd-6.0.9-mdadm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mkinitrd-6.0.9-mdadm.patch	21 May 2007 15:37:38 -0000	1.2
+++ mkinitrd-6.0.9-mdadm.patch	7 Jun 2007 17:09:24 -0000	1.3
@@ -5,9 +5,9 @@
  fi
  
 +if [ -n "$raiddevices" ]; then
-+    inst /sbin/mdadm "$MNTIMAGE/bin/mdadm"
++    inst /sbin/mdadm "$MNTIMAGE"
 +    if [ -f /etc/mdadm.conf ]; then
-+        inst /etc/mdadm.conf "$MNTIMAGE/etc/mdadm.conf"
++        inst /etc/mdadm.conf "$MNTIMAGE"
 +    fi
 +fi
 +


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- mkinitrd.spec	21 May 2007 15:40:29 -0000	1.203
+++ mkinitrd.spec	7 Jun 2007 17:09:24 -0000	1.204
@@ -3,12 +3,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.9
-Release: 4
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
 Patch0: mkinitrd-6.0.9-mdadm.patch
 Patch1: mkinitrd-6.0.9-nosegneg.patch
+Patch2: mkinitrd-6.0.9-lstat.patch
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -68,6 +69,7 @@
 %setup -q -n mkinitrd-%{version}
 %patch0 -p0 -b .mdadm
 %patch1 -p0 -b .nosegneg
+%patch2 -p1 -b .lstat
 
 %build
 make LIB=%{_lib}
@@ -115,6 +117,14 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Thu Jun  7 2007 Peter Jones <pjones at redhat.com> - 6.0.9-6
+- Use stat(2) not lstat(2) when probing subdirs in /sys/block .  Needed
+  before gregkh-driver-block-device.patch in 2.6.22-rc4-mm1 makes it upstream.
+  (reported by Kay Sievers)
+
+* Mon May 21 2007 Jeremy Katz <katzj at redhat.com> - 6.0.9-5
+- update mdadm patch to install binaries in the right place (#221696)
+
 * Mon May 21 2007 Peter Jones <pjones at redhat.com> - 6.0.9-4
 - Update patch from -2 to use dynamic mdadm.