rpms/udev/devel udev-rules.patch,1.24,1.25 udev.spec,1.190,1.191

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- skip persistent block for gnbd devices (bug #210227)


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

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- udev-rules.patch	3 Oct 2006 20:18:25 -0000	1.24
+++ udev-rules.patch	11 Oct 2006 06:49:42 -0000	1.25
@@ -1,15 +1,5 @@
---- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-07-04 06:34:55.000000000 -0400
-+++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-10-03 16:10:41.000000000 -0400
-@@ -1,6 +1,7 @@
- # 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"                    
- 
- # ignore these events until someone needs them
- SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
---- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-04 06:34:55.000000000 -0400
-+++ udev-095/etc/udev/redhat/50-udev.rules	2006-10-03 16:14:24.000000000 -0400
+--- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-04 12:34:55.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-10-11 08:45:35.000000000 +0200
 @@ -28,7 +28,8 @@
  KERNEL=="ippp*",		NAME="%k", MODE="0660"
  KERNEL=="isdn*",		NAME="%k", MODE="0660"
@@ -58,6 +48,15 @@
  KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
+@@ -262,7 +256,7 @@
+ SUBSYSTEM!="block", GOTO="persistent_end"
+ 
+ # skip rules for inappropriate block devices
+-KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
++KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", GOTO="persistent_end"
+ 
+ # never access removable ide devices, the drivers are causing event loops on open()
+ BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1",	GOTO="persistent_end"
 @@ -345,5 +339,8 @@
  ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
  	RUN+="/sbin/modprobe st"
@@ -67,3 +66,13 @@
 +
  RUN+="socket:/org/kernel/udev/monitor"
  
+--- 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-10-11 08:45:05.000000000 +0200
+@@ -1,6 +1,7 @@
+ # 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"                    
+ 
+ # ignore these events until someone needs them
+ SUBSYSTEM=="drivers",		OPTIONS="ignore_device"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- udev.spec	4 Oct 2006 08:24:32 -0000	1.190
+++ udev.spec	11 Oct 2006 06:49:42 -0000	1.191
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 13
+Release: 14
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -330,6 +330,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Oct 11 2006 Harald Hoyer <harald at redhat.com> - 095-14
+- skip persistent block for gnbd devices (bug #210227)
+
 * Wed Oct  4 2006 Harald Hoyer <harald at redhat.com> - 095-13
 - fixed path_id script (bug #207139)