rpms/udev/devel udev-rules.patch,1.18,1.19 udev.spec,1.183,1.184

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
fixed bug #204157

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

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- udev-rules.patch	7 Aug 2006 12:59:00 -0000	1.18
+++ udev-rules.patch	29 Aug 2006 08:09:03 -0000	1.19
@@ -1,5 +1,5 @@
 --- 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-08-07 14:53:56.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-08-29 10:06:55.000000000 +0200
 @@ -28,7 +28,8 @@
  KERNEL=="ippp*",		NAME="%k", MODE="0660"
  KERNEL=="isdn*",		NAME="%k", MODE="0660"
@@ -10,7 +10,19 @@
  KERNEL=="dcbri*",		NAME="%k", MODE="0660"
  KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
  KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
-@@ -217,8 +218,11 @@
+@@ -155,10 +156,7 @@
+ SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
+ 	NAME="%c", MODE="0660"
+ 
+-# create a symlink named after the device map name
+-# note devmap_name comes with extras/multipath
+-#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
+-
++KERNEL=="dm-[0-9]*",            OPTIONS+="ignore_device"
+ 
+ # alsa devices
+ KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+@@ -217,8 +215,11 @@
  KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
  
@@ -24,7 +36,7 @@
  
  # Section for zaptel device
  KERNEL=="zapctl",     		NAME="zap/ctl"
-@@ -229,8 +233,6 @@
+@@ -229,8 +230,6 @@
  
  KERNEL=="pktcdvd", NAME="%k/control"
  
@@ -33,8 +45,8 @@
  KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
  	SYSFS{device/media}=="floppy", \
  	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
---- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules	2006-08-07 14:58:23.000000000 +0200
-+++ udev-095/etc/udev/redhat/05-udev-early.rules	2006-08-07 14:50:58.000000000 +0200
+--- 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-08-29 10:06: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"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- udev.spec	16 Aug 2006 15:27:55 -0000	1.183
+++ udev.spec	29 Aug 2006 08:09:03 -0000	1.184
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -329,6 +329,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Tue Aug 29 2006 Harald Hoyer <harald at redhat.com> - 095-8
+- fixed bug #204157
+
 * Wed Aug 16 2006 Harald Hoyer <harald at redhat.com> - 095-7
 - added udevtimeout=<timeout in seconds>
   kernel command line parameters for start_udev