rpms/udev/devel udev-post.init,1.7,1.8 udev.spec,1.283,1.284

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32307

Modified Files:
	udev-post.init udev.spec 
Log Message:
* Fri Jul 03 2009 Harald Hoyer <harald at redhat.com> 143-2
- add acpi floppy modalias
- add retrigger of failed events in udev-post.init
- killall pids of udev in %pre



Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- udev-post.init	17 Mar 2008 18:09:38 -0000	1.7
+++ udev-post.init	3 Jul 2009 13:48:12 -0000	1.8
@@ -22,6 +22,12 @@
 # See how we were called.
 case "$1" in
   start|reload)
+	STRING=$"Retrigger failed udev events"
+	echo -n $STRING 
+	/sbin/udevadm trigger --retry-failed
+	success "$STRING"
+	echo
+
 	STRING=$"Adding udev persistent rules"
 	
 	# copy the rules generated before / was mounted read-write


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- udev.spec	22 Jun 2009 10:47:52 -0000	1.283
+++ udev.spec	3 Jul 2009 13:48:12 -0000	1.284
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 143
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -128,7 +128,7 @@ ln -sf ../../sbin/udevadm $RPM_BUILD_ROO
 ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevcontrol
 
 for i in \
-        rules/redhat/40-redhat.rules \
+	rules/redhat/40-redhat.rules \
 %ifarch ia64
 	rules/packages/40-ia64.rules \
 %endif
@@ -158,6 +158,7 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwa
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/floppy-pnp.conf <<EOF
 alias pnp:dPNP0700 floppy
+alias acpi:PNP0700: floppy
 EOF
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
@@ -196,10 +197,15 @@ getent group dialout >/dev/null || /usr/
 if test -f /proc/1/exe -a -d /proc/1/root; then
 	if test -x /usr/bin/stat -a "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
 		if test -x /sbin/udevd -a -x /sbin/pidof ; then
+			/sbin/udevadm control --stop-exec-queue
 			pid=$(/sbin/pidof -c udevd)
-			if [ -n "$pid" ]; then
-				kill $pid
-			fi
+			while [ -n "$pid" ]; do
+				for p in $pid; do
+					kill $hard $p;
+				done
+				pid=$(/sbin/pidof -c udevd)
+				hard="-9"
+			done
 		fi
 	fi
 fi
@@ -209,28 +215,13 @@ exit 0
 # start daemon if we are not in a chroot
 if test -f /proc/1/exe -a -d /proc/1/root; then
 	if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
-		if test -x /sbin/udevd; then
 		/sbin/udevd -d
-		fi
+		/sbin/udevadm control --start-exec-queue
 	fi
 fi
 
 exit 0
 
-%triggerpostun -- dev <= 0:3.12-1
-if [ $2 = 0 ]; then
-	if [ -x /sbin/MAKEDEV ]; then 
-		/sbin/MAKEDEV null
-	else
-		/bin/mknod /dev/null c 1 3
-	fi
-	/sbin/start_udev >/dev/null 2>&1
-	if [ -e /dev/mapper/control -a -x /sbin/lvm ]; then
-		/sbin/lvm vgmknodes >/dev/null 2>&1
-	fi
-fi
-exit 0
-
 %triggerin -- selinux-policy
 rm -f /var/lib/udev/makenode.d/*  >/dev/null 2>&1 || :
 
@@ -345,6 +336,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Jul 03 2009 Harald Hoyer <harald at redhat.com> 143-2
+- add acpi floppy modalias
+- add retrigger of failed events in udev-post.init
+- killall pids of udev in %%pre
+
 * Fri Jun 19 2009 Harald Hoyer <harald at redhat.com> 143-1
 - version 143
 
@@ -354,7 +350,7 @@ rm -rf $RPM_BUILD_ROOT
 - git fix: rule-generator: cd - skip by-path links if we create by-id links
 - git fix: fix possible endless loop for GOTO to non-existent LABEL
 - git fix: cdrom_id: suppress ID_CDROM_MEDIA_STATE=blank for plain non-writable 
-           CDROM media
+		CDROM media
 
 * Thu Jun 08 2009 Harald Hoyer <harald at redhat.com> 142-3
 - delay device-mapper changes