- we have udevadm in /sbin

- always enable systemd-udev-settle.service and clean leftover udev-settle.service
- don't package udev services twice

Changed files:
    systemd.spec -> 1.169
    udevadm-in-sbin.patch -> 1.1

diff --git a/systemd.spec b/systemd.spec
index b68ed61a60109e0e6b16be2fc1dae6bab8e235a1..154b6a622dec4f34ddc4df4a35125ac0ae7670ef 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -39,7 +39,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       183
-Release:       0.3
+Release:       0.5
 Epoch:         1
 License:       GPL v2+
 Group:         Base
@@ -78,6 +78,7 @@ Patch8:               udev-ploop-rules.patch
 Patch9:                udevlibexecdir.patch
 Patch10:       static-udev.patch
 Patch11:       systemd-udev-service.patch
+Patch12:       udevadm-in-sbin.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -546,6 +547,7 @@ initrd.
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1
+%patch12 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %{__mv} src/udev/keymap/keyboard-force-release.sh{,.in}
@@ -855,8 +857,9 @@ fi
 %triggerpostun -n udev-core -- udev < 165
 /sbin/udevadm info --convert-db
 
-%triggerpostun -n udev-core -- %{name}-core < 1:175-4
-%systemd_trigger systemd-udev-settle.service
+%triggerpostun -n udev-core -- %{name}-core < 1:183
+/bin/systemctl --quiet enable systemd-udev-settle.service || :
+%{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service || :
 
 %post -n udev-core
 if [ $1 -gt 1 ]; then
@@ -1075,6 +1078,7 @@ fi
 %{systemdunitdir}/*.socket
 %{systemdunitdir}/*.target
 %{systemdunitdir}/*.timer
+%exclude %{systemdunitdir}/systemd-udev.*
 %if %{with plymouth}
 %exclude %{systemdunitdir}/plymouth*.service
 %exclude %{systemdunitdir}/systemd-ask-password-plymouth.*
@@ -1281,8 +1285,6 @@ fi
 %{_mandir}/man8/udevadm.8*
 %{_mandir}/man8/udevd.8*
 
-#{systemdunitdir}/basic.target.wants/udev-trigger.service
-#{systemdunitdir}/basic.target.wants/udev.service
 %{systemdunitdir}/sockets.target.wants/systemd-udev-control.socket
 %{systemdunitdir}/sockets.target.wants/systemd-udev-kernel.socket
 %{systemdunitdir}/systemd-udev-control.socket

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
new file mode 100644 (file)
index 0000000..4eb53e4
--- /dev/null
+++ b/udevadm-in-sbin.patch
@@ -0,0 +1,19 @@
+--- systemd-183/units/systemd-udev-trigger.service.in~ 2012-05-21 15:14:51.642981269 +0200
++++ systemd-183/units/systemd-udev-trigger.service.in  2012-05-30 13:55:20.229509590 +0200
+@@ -17,4 +17,4 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add
++ExecStart=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
+--- systemd-183/units/systemd-udev-settle.service.in~  2012-05-30 13:43:34.886201138 +0200
++++ systemd-183/units/systemd-udev-settle.service.in   2012-05-30 13:55:44.546175399 +0200
+@@ -29,7 +29,7 @@
+ Type=oneshot
+ TimeoutSec=180
+ RemainAfterExit=yes
+-ExecStart=@bindir@/udevadm settle
++ExecStart=@sbindir@/udevadm settle
+ 
+ [Install]
+ WantedBy=basic.target