[udev] - fixed udev-trigger.service

[Harald Hoyer]

commit 0b0304cfe18782b99aaa0814f9610d7ec91fcc2b
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Mar 31 17:58:51 2011 +0200

    - fixed udev-trigger.service

 ...-settle-depend-on-trigger-do-not-block-ba.patch |   51 ++++++++++++++++++++
 udev.spec                                          |    8 +++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch
new file mode 100644
index 0000000..aa67cf1
--- /dev/null
+++ b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch
@@ -0,0 +1,51 @@
+From daf32d32172e19e78754999b41c27b45e3629326 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers at vrfy.org>
+Date: Thu, 31 Mar 2011 13:15:47 +0200
+Subject: [PATCH] systemd: let settle depend on trigger, do not block basic with trigger
+
+---
+ init/udev-settle.service.in  |   15 +++++++++------
+ init/udev-trigger.service.in |    1 -
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
+index be06a39..bda8626 100644
+--- a/init/udev-settle.service.in
++++ b/init/udev-settle.service.in
+@@ -1,15 +1,18 @@
+-# This barrier service is usually not enabled by default. If enabled,
+-# it acts as a barrier for basic.target -- so all later services will
++# This service is usually not enabled by default. If enabled, it
++# acts as a barrier for basic.target -- so all later services will
+ # wait for udev completely finishing its coldplug run.
+ #
+-# It might be enabled just unconditionally, or pulled-in on-demand by
+-# broken or non-hotplug-aware services that assume a fully populated
+-# /dev at startup.
++# If needed, to work around broken or non-hotplug-aware services,
++# it might be enabled unconditionally, or pulled-in on-demand by
++# the services that assume a fully populated /dev at startup. It
++# should not be used or pulled-in ever on systems without such
++# legacy services running.
+ 
+ [Unit]
+ Description=udev Wait for Complete Device Initialization
+ DefaultDependencies=no
+-After=udev.service
++Requires=udev.service
++After=udev-trigger.service
+ Before=basic.target
+ 
+ [Service]
+diff --git a/init/udev-trigger.service.in b/init/udev-trigger.service.in
+index 0ede317..745974a 100644
+--- a/init/udev-trigger.service.in
++++ b/init/udev-trigger.service.in
+@@ -2,7 +2,6 @@
+ Description=udev Coldplug all Devices
+ Requires=udev.service
+ After=udev.service
+-Before=basic.target
+ DefaultDependencies=no
+ 
+ [Service]
diff --git a/udev.spec b/udev.spec
index 55d4f63..223ac87 100644
--- a/udev.spec
+++ b/udev.spec
@@ -7,7 +7,7 @@
 Summary: A rule-based device node and kernel event manager
 Name: udev
 Version: 167
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -16,6 +16,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t
 
 Source1: start_udev
 
+Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch
+
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -111,6 +113,7 @@ glib-based applications using libudev functionality.
 
 %prep 
 %setup -q 
+%patch3 -p1 -b .git3
 
 %build
 # prevent man pages from re-building (xmlto)
@@ -358,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Thu Mar 31 2011 Harald Hoyer <harald at redhat.com> 167-2
+- fixed udev-trigger.service
+
 * Wed Mar 30 2011 Harald Hoyer <harald at redhat.com> 167-1
 - version 167