rpms/udev/F-9 udev-vol_id-cdrom.patch, NONE, 1.1 start_udev, 1.75, 1.76 udev.spec, 1.248, 1.249

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27667

Modified Files:
	start_udev udev.spec 
Added Files:
	udev-vol_id-cdrom.patch 
Log Message:
* Wed Aug 06 2008 Harald Hoyer <harald at redhat.com> 124-2
- added patch for cdrom tray close bug (rhbz#453095)
- fixed udevadm syntax in start_udev (credits B.J.W. Polman)


udev-vol_id-cdrom.patch:

--- NEW FILE udev-vol_id-cdrom.patch ---
--- a/etc/udev/rules.d/60-persistent-storage.rules
+++ b/etc/udev/rules.d/60-persistent-storage.rules
@@ -52,6 +52,8 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA
 
 # skip unpartitioned removable media devices from drivers which do not send "change" events
 ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
+# skip optical drives without media
+ENV{DEVTYPE}=="disk", KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}!="?*", GOTO="persistent_storage_end"
 
 # import filesystem metadata
 IMPORT{program}="vol_id --export $tempnode"


Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/start_udev,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- start_udev	12 Jun 2008 10:14:07 -0000	1.75
+++ start_udev	6 Aug 2008 12:18:39 -0000	1.76
@@ -234,36 +234,36 @@
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 
-	/sbin/udevd -d
+	if strstr "$cmdline" udevtrace; then
+		UDEV_OPTS="$UDEV_OPTS --debug-trace"
+	fi
+	/sbin/udevd -d $UDEV_OPTS
 	ret=$[$ret + $?]
 
 	udevtimeout=$(getval udevtimeout $cmdline)
 
 	if strstr "$cmdline" udevdebug; then
-		/sbin/udevadm control log_priority=debug
+		/sbin/udevadm control --log_priority=debug
 	fi
 	if strstr "$cmdline" udevinfo; then
-		/sbin/udevadm control log_priority=info
-	fi
-	if strstr "$cmdline" udevtrace; then
-		UDEV_OPTS="$UDEV_OPTS --debug-trace"
+		/sbin/udevadm control --log_priority=info
 	fi
 	if strstr "$cmdline" udevchilds; then
-		/sbin/udevadm control max_childs_running=$(getval udevchilds $cmdline)
+		/sbin/udevadm control --max_childs_running=$(getval udevchilds $cmdline)
 	fi
 
 	if [ "$UDEV_PERSISTENT_STORAGE" == "no" ]; then
-            /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1
+            /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1
 	fi	  
 
 	if strstr "$cmdline" udevnopersist; then
-            /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1
+            /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1
 	fi	  
 
-        /sbin/udevadm control env STARTUP=1
+        /sbin/udevadm control --env=STARTUP=1
 
 	if strstr "$cmdline" modprobedebug; then
-		/sbin/udevadm control env MODPROBE_OPTIONS="-s -v -q"
+		/sbin/udevadm control --env=MODPROBE_OPTIONS="-s -v -q"
 		echo
 		findalias /sys | while read modules ; do
 			if [ -n "$modules" ]; then
@@ -279,7 +279,7 @@
 	wait_for_queue $udevtimeout
 	ret=$[$ret + $?]
 	wait
-	/sbin/udevadm control env STARTUP=
+	/sbin/udevadm control --env=STARTUP=
 else
 	echo -n " kernel too old for this udev version "
 	/sbin/udevd -d $UDEV_OPTS


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-9/udev.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- udev.spec	4 Jul 2008 15:25:00 -0000	1.248
+++ udev.spec	6 Aug 2008 12:18:39 -0000	1.249
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 124
-Release: 1%{?dist}.2
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -23,6 +23,7 @@
 Patch102: udev-118-sysconf.patch
 Patch103: udev-089-nopie.patch
 Patch104: udev-091-lib64.patch
+Patch105: udev-vol_id-cdrom.patch
 
 Patch200: udev-120-rhrules.patch
 
@@ -81,6 +82,7 @@
 
 %patch103 -p1 -b .nopie
 %patch104 -p1 -b .lib64
+%patch105 -p1 -b .tray
 
 %patch200 -p1 -b .rhrules
 
@@ -405,6 +407,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Aug 06 2008 Harald Hoyer <harald at redhat.com> 124-2
+- added patch for cdrom tray close bug (rhbz#453095)
+- fixed udevadm syntax in start_udev (credits B.J.W. Polman)
+
 * Fri Jul 04 2008 Harald Hoyer <harald at redhat.com> 124-1.2
 - make block devices 0660 as an interim fix (rhbz#451320)