[udev/f13/master] * Fri Aug 13 2010 Harald Hoyer <harald at redhat.com> 153-3 - revert the default trigger to "add"

[Harald Hoyer]

commit b5e470b9567d023f988dc06e45a6982790ff7b0c
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Aug 13 10:30:02 2010 +0200

    * Fri Aug 13 2010 Harald Hoyer <harald at redhat.com> 153-3
    - revert the default trigger to "add"

 udev-153-trigger.patch |   22 ++++++++++++++++++++++
 udev-post.init         |    2 +-
 udev.spec              |    9 +++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/udev-153-trigger.patch b/udev-153-trigger.patch
new file mode 100644
index 0000000..2bce982
--- /dev/null
+++ b/udev-153-trigger.patch
@@ -0,0 +1,22 @@
+diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
+index 03aa534..dbcaee3 100644
+--- a/udev/udevadm-trigger.c
++++ b/udev/udevadm-trigger.c
+@@ -110,7 +110,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
+ 		TYPE_SUBSYSTEMS,
+ 		TYPE_FAILED,
+ 	} device_type = TYPE_DEVICES;
+-	const char *action = "change";
++	const char *action = "add";
+ 	struct udev_enumerate *udev_enumerate;
+ 	int rc = 0;
+ 
+@@ -184,7 +184,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
+ 			       "      subsystems                    sys subsystems and drivers\n"
+ 			       "      failed                        trigger only the events which have been\n"
+ 			       "                                    marked as failed during a previous run\n"
+-			       "  --action=<action>               event action value, default is \"change\"\n"
++			       "  --action=<action>               event action value, default is \"add\"\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
diff --git a/udev-post.init b/udev-post.init
index 67ed0c9..89df663 100644
--- a/udev-post.init
+++ b/udev-post.init
@@ -26,7 +26,7 @@ case "$1" in
 	[ -w /var/lock/subsys ] || exit 4
 	STRING=$"Retrigger failed udev events"
 	echo -n $STRING 
-	/sbin/udevadm trigger --type=failed
+	/sbin/udevadm trigger --type=failed --action=add
 	success "$STRING"
 	echo
 
diff --git a/udev.spec b/udev.spec
index 23ca1ce..a5a4030 100644
--- a/udev.spec
+++ b/udev.spec
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 153
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -24,6 +24,7 @@ Patch102: udev-153-n210.patch
 Patch103: udev-151-gperf.patch
 Patch104: udev-git484e1b2d11b9b89418589d885a625e647881933b.patch
 Patch105: udev-153-changer.patch
+Patch106: udev-153-trigger.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -138,6 +139,7 @@ glib-based applications using libudev functionality.
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 %build
 autoreconf -i
@@ -374,7 +376,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
-* Wed Aug 04 2010 Harald Hoyer <harald at redhat.com> 153-1.0.test.1
+* Fri Aug 13 2010 Harald Hoyer <harald at redhat.com> 153-3
+- revert the default trigger to "add"
+
+* Wed Aug 04 2010 Harald Hoyer <harald at redhat.com> 153-2
 - trigger with action==add
 - add rd_NO_MDIMSM on noiswmd kernel cmdline option
 Resolves: rhbz#589774