rpms/udev/devel udev-rules.patch,1.21,1.22 udev.spec,1.186,1.187

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32624

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- load the mptctl module, if mptbase is loaded (bug #205510)


udev-rules.patch:
 05-udev-early.rules |    9 ++++++++-
 50-udev.rules       |   14 ++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- udev-rules.patch	27 Sep 2006 16:18:08 -0000	1.21
+++ udev-rules.patch	28 Sep 2006 13:58:57 -0000	1.22
@@ -49,12 +49,22 @@
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
 --- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-09-25 13:16:26.000000000 +0200
-@@ -1,6 +1,7 @@
++++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-09-28 15:56:15.000000000 +0200
+@@ -1,9 +1,16 @@
  # sysfs is populated after the event is sent
  ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
  ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 +ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"                    
++
++ACTION=="add", SUBSYSTEM=="module", KERNEL=="mptbase", \
++	RUN="/sbin/modprobe mptctl", OPTIONS="last_rule", \
++	GOTO="processed_modules"
++
++SUBSYSTEM=="module",		OPTIONS="ignore_device"
++LABEL="processed_modules"
  
  # ignore these events until someone needs them
  SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
+-SUBSYSTEM=="module",		OPTIONS="ignore_device"
+ 
+ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- udev.spec	27 Sep 2006 16:15:46 -0000	1.186
+++ udev.spec	28 Sep 2006 13:58:57 -0000	1.187
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 10
+Release: 11
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -328,6 +328,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Sep 28 2006 Harald Hoyer <harald at redhat.com> - 095-11
+- load the mptctl module, if mptbase is loaded (bug #205510)
+
 * Wed Sep 27 2006 Harald Hoyer <harald at redhat.com> - 095-10
 - typo in xpram/slram rule (bug #205563)