rpms/mkinitrd/F-7 mkinitrd-6.0.9-lstat.patch, NONE, 1.1 mkinitrd.spec, 1.202, 1.203

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-6.0.9-lstat.patch 
Log Message:
- update to fix block device probing when CONFIG_SYSFS_DEPRECATED is set in
  2.6.22-rc4-mm1 (gregkh-driver-block-device.patch)


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) {


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-7/mkinitrd.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- mkinitrd.spec	21 May 2007 16:54:40 -0000	1.202
+++ mkinitrd.spec	7 Jun 2007 15:25:00 -0000	1.203
@@ -3,12 +3,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.9
-Release: 5
+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 -p0 -b .lstat
 
 %build
 make LIB=%{_lib}
@@ -115,6 +117,11 @@
 %{_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)