rpms/mkinitrd/F-10 mkinitrd-6.0.71-scsi_wait_scan.patch, NONE, 1.1 .cvsignore, 1.211, 1.212 mkinitrd.spec, 1.296, 1.297 sources, 1.252, 1.253

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/mkinitrd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31030

Modified Files:
	.cvsignore mkinitrd.spec sources 
Added Files:
	mkinitrd-6.0.71-scsi_wait_scan.patch 
Log Message:
* Mon Dec  8 2008 Hans de Goede <hdegoede at redhat.com> - 6.0.71-3
- Use scsi_wait_scan on scsi devices instead of stabilized (#470628)


mkinitrd-6.0.71-scsi_wait_scan.patch:

--- NEW FILE mkinitrd-6.0.71-scsi_wait_scan.patch ---
From: Peter Jones <pjones at redhat.com>
Date: Thu, 4 Dec 2008 18:23:37 +0000 (-0500)
Subject: Use scsi_wait_scan on scsi devices instead of stabilized (#470628)
X-Git-Tag: 6.0.73-1~1
X-Git-Url: http://git.fedorahosted.org/git/?p=mkinitrd;a=commitdiff_plain;h=9db36d78f92eff841bd22da1e502a6b5e9080b20

Use scsi_wait_scan on scsi devices instead of stabilized (#470628)

Get rid of wait_for_scsi entirely, and make anything with a scsi
modalias cause us to use the scsi_wait_scan kernel module.
---

diff --git a/mkinitrd b/mkinitrd
index 39ed66f..0492998 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -66,7 +66,7 @@ ncryptoparts=0
 ncryptolvs=0
 ncryptoraids=0
 root=""
-wait_for_scsi="no"
+scsi_wait_scan="no"
 
 NET_LIST=""
 LD_SO_CONF=/etc/ld.so.conf
@@ -138,7 +138,6 @@ resolve_device_name() {
     echo nash-resolveDevice "$1" | /sbin/nash --forcequiet
 }
 
-scsi_wait_scan="no"
 findmodule() {
     modlist=MODULES
     subcmd="findmodule"
@@ -358,8 +357,8 @@ findstoragedriverinsys () {
         deps=
         if [ -f modalias ]; then
             MODALIAS=$(cat modalias)
-            if [ "${modalias::7}" == "scsi:t-" ]; then
-                wait_for_scsi=yes
+            if [ "${MODALIAS::7}" == "scsi:t-" ]; then
+                scsi_wait_scan=yes
             fi
             moduledep $MODALIAS
             unset MODALIAS
@@ -1507,31 +1506,9 @@ emitmodules() {
 EOF
             done
         fi
-        # some of these aren't modules any more, but that 
-        # generally makes them so much more likely to win
-        # the race that we haven't seen cases where it matters
-        # yet.  Nevertheless:
-        # XXX PJFIX: we need a better mechanism here.
-        if [ 1 -eq 0 \
-                -o "ahci" == "$module" \
-                -o "ata_piix" == "$module" \
-                -o "ibmvscsic" == "$module" \
-                -o "BusLogic" == "$module" \
-                -o "mptbase" == "$module" \
-                -o "pata_" == "${module::5}" \
-                -o "qla" == "${module::3}" \
-                -o "sata_" == "${module::5}" \
-                ]; then
-            wait_for_scsi="yes"
-        fi
     done
-    if [ "$wait_for_scsi" == "yes" ]; then
-        emit "echo Waiting for driver initialization."
-        emit "stabilized --hash --interval 250 /proc/scsi/scsi"
-    fi
     unset usb_mounted
     unset found_hcd_module
-    unset wait_for_scsi
 }
 
 if [ $ncryptodevs -ne 0 ]; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-10/.cvsignore,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- .cvsignore	12 Nov 2008 19:43:52 -0000	1.211
+++ .cvsignore	8 Dec 2008 18:40:36 -0000	1.212
@@ -1,4 +1,2 @@
 clog
-mkinitrd-6.0.69.tar.bz2
-mkinitrd-6.0.70.tar.bz2
 mkinitrd-6.0.71.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-10/mkinitrd.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- mkinitrd.spec	12 Nov 2008 19:43:52 -0000	1.296
+++ mkinitrd.spec	8 Dec 2008 18:40:36 -0000	1.297
@@ -3,10 +3,13 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.71
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
+# This patch is in 6.0.73, but we don't want the more bleeding edge libdhcp ->
+# dhclient changes also in there.
+Patch0: mkinitrd-6.0.71-scsi_wait_scan.patch
 ExclusiveOs: Linux
 URL: git://git.fedoraproject.org/git/hosted/mkinitrd
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -66,6 +69,7 @@
 
 %prep
 %setup -q -n mkinitrd-%{version}
+%patch0 -p1
 find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 
 %build
@@ -120,6 +124,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Mon Dec  8 2008 Hans de Goede <hdegoede at redhat.com> - 6.0.71-3
+- Use scsi_wait_scan on scsi devices instead of stabilized (#470628)
+
 * Wed Nov 12 2008 Peter Jones <pjones at redhat.com> - 6.0.71-2
 - Rebuild on the F-10 branch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-10/sources,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- sources	12 Nov 2008 19:43:52 -0000	1.252
+++ sources	8 Dec 2008 18:40:37 -0000	1.253
@@ -1,3 +1 @@
-171d6c0969da5680400ce7aedb07451f  mkinitrd-6.0.69.tar.bz2
-520a5a6371eb78fc13d5e36357f56fd2  mkinitrd-6.0.70.tar.bz2
 74765dd1e340adc4b21a77c61e1c3f2b  mkinitrd-6.0.71.tar.bz2