rpms/mkinitrd/devel mkinitrd-5.0.41-sbp2.patch, NONE, 1.1 mkinitrd-5.0.41-stabilized.patch, NONE, 1.1 mkinitrd.spec, 1.123, 1.124

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9351

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-5.0.41-sbp2.patch mkinitrd-5.0.41-stabilized.patch 
Log Message:
- fix 'stabilized' stuff

mkinitrd-5.0.41-sbp2.patch:
 mkinitrd |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE mkinitrd-5.0.41-sbp2.patch ---
--- mkinitrd-5.0.41/mkinitrd.sbp2	2006-05-27 16:12:17.000000000 -0400
+++ mkinitrd-5.0.41/mkinitrd	2006-05-27 16:12:52.000000000 -0400
@@ -1008,6 +1008,10 @@
         emit "echo Waiting for driver initialization."
         emit "stabilized /proc/bus/usb/devices"
     fi
+    if [ "$module" = "sbp2" ]; then
+        emit "echo Waiting for driver initialization."
+        emit "stabilized /sys/bus/ieee1394/drivers/sbp2"
+    fi
     if [ "$module" = "zfcp" -a -f /etc/zfcp.conf ]; then
 	emit "echo Waiting 2 seconds for driver initialization."
         emit "sleep 2"

mkinitrd-5.0.41-stabilized.patch:
 nash.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE mkinitrd-5.0.41-stabilized.patch ---
--- mkinitrd-5.0.41/nash/nash.c.sbp2	2006-05-27 16:15:27.000000000 -0400
+++ mkinitrd-5.0.41/nash/nash.c	2006-05-27 16:15:34.000000000 -0400
@@ -1566,7 +1566,10 @@
 
     memset(&sb, '\0', sizeof(sb));
     do {
-        sb.st_mtime = 0;
+        if (stat(file, &sb) == -1) {
+            eprintf("stabilized: stat %s: %m\n", file);
+            return 1;
+        }
         if (sb.st_mtime == last) {
             if (++count == 5)
                 return 0;


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mkinitrd.spec	24 May 2006 21:54:25 -0000	1.123
+++ mkinitrd.spec	27 May 2006 20:21:58 -0000	1.124
@@ -1,10 +1,12 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.0.41
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
+Patch0: mkinitrd-5.0.41-sbp2.patch
+Patch1: mkinitrd-5.0.41-stabilized.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -38,6 +40,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .sbp2
+%patch1 -p1 -b .stabilized
 
 %build
 make
@@ -63,6 +67,10 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Sat May 27 2006 Peter Jones <pjones at redhat.com> - 5.0.42-2
+- fix "stabilized" to actually stat where appropriate
+- use stabilized for sbp2 (firewire) as well
+
 * Wed May 24 2006 Peter Jones <pjones at redhat.com> - 5.0.41-1
 - (very) basic multipath support
 - minor fixes for usb