rpms/udev/devel start_udev, 1.52, 1.53 udev-rules.patch, 1.12, 1.13 udev.spec, 1.164, 1.165

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	start_udev udev-rules.patch udev.spec 
Log Message:
version 090


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- start_udev	13 Apr 2006 08:46:43 -0000	1.52
+++ start_udev	19 Apr 2006 11:44:47 -0000	1.53
@@ -109,23 +109,13 @@
 
 
 wait_for_queue() {
-	loop=20
-	while test ! -d /dev/.udev/queue; do
-                usleep 100000;
-                test "$loop" -gt 0 || return 1
-                loop=$(($loop - 1))
-        done
-
-	loop=200
-	while test -d /dev/.udev/queue; do
-		usleep 100000;
-		if [ "$loop" -le 0 ]; then
-			echo -n "Wait timeout. Will continue in the background."
-			return 1
-		fi
-		loop=$(($loop - 1))
-	done
-	return 0
+	local ret=0
+	/sbin/udevsettle --timeout=100
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		echo -n "Wait timeout. Will continue in the background."
+	fi
+	return $ret;
 }
 
 export ACTION=add

udev-rules.patch:
 50-udev.rules |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- udev-rules.patch	13 Apr 2006 08:46:43 -0000	1.12
+++ udev-rules.patch	19 Apr 2006 11:44:47 -0000	1.13
@@ -1,6 +1,28 @@
---- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-12 15:27:32.000000000 +0200
-+++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-12 15:29:35.000000000 +0200
-@@ -271,15 +271,15 @@
+--- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-03 14:41:10.000000000 +0200
++++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-18 12:00:25.000000000 +0200
+@@ -40,8 +40,9 @@
+ KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
+ KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
+-KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+-KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
++KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
++KERNEL=="ttyUSB*", SYSFS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+ 
+ # vc devices
+ KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+@@ -90,9 +91,6 @@
+ KERNEL=="dmmidi*",		MODE="0660"
+ KERNEL=="sndstat",		MODE="0660"
+ 
+-# pilot/palm devices
+-KERNEL=="pilot",		GROUP="uucp", MODE="0660"
+-
+ # lp devices
+ KERNEL=="lp*",			GROUP="lp", MODE="0660"
+ KERNEL=="parport*",		GROUP="lp", MODE="0660"
+@@ -271,15 +269,15 @@
  BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
  
  # by-id (hardware serial number)
@@ -21,7 +43,7 @@
  KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
  
  # for partitions import parent information
-@@ -287,19 +287,19 @@
+@@ -287,19 +285,19 @@
  KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
  
  # by-path (shortest physical path)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- udev.spec	13 Apr 2006 09:48:34 -0000	1.164
+++ udev.spec	19 Apr 2006 11:44:47 -0000	1.165
@@ -4,7 +4,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 089
+Version: 090
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -242,6 +242,7 @@
 %attr(0755,root,root) /sbin/udevcontrol
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevtrigger
+%attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/start_udev
 #%attr(755,root,root) /sbin/udev_volume_id
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
@@ -303,6 +304,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Apr 19 2006 Harald Hoyer <harald at redhat.com> - 090-1
+- version 090
+
 * Thu Apr 13 2006 Harald Hoyer <harald at redhat.com> - 089-1
 - version 089
 - do not force loading of parport_pc (bug #186850)