Author: baggins Date: Wed May 30 12:16:49 2012 GMT Module: packages Tag: HEAD ---- Log message: - we have udevadm in /sbin - always enable systemd-udev-settle.service and clean leftover udev-settle.service - don't package udev services twice
---- Files affected: packages/systemd: systemd.spec (1.168 -> 1.169) , udevadm-in-sbin.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/systemd/systemd.spec diff -u packages/systemd/systemd.spec:1.168 packages/systemd/systemd.spec:1.169 --- packages/systemd/systemd.spec:1.168 Wed May 30 13:34:24 2012 +++ packages/systemd/systemd.spec Wed May 30 14:16:44 2012 @@ -40,7 +40,7 @@ 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 @@ -79,6 +79,7 @@ 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} @@ -547,6 +548,7 @@ %patch8 -p1 %patch9 -p1 %patch11 -p1 +%patch12 -p1 cp -p %{SOURCE2} src/systemd_booted.c %{__mv} src/udev/keymap/keyboard-force-release.sh{,.in} @@ -856,8 +858,9 @@ %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 @@ -1076,6 +1079,7 @@ %{systemdunitdir}/*.socket %{systemdunitdir}/*.target %{systemdunitdir}/*.timer +%exclude %{systemdunitdir}/systemd-udev.* %if %{with plymouth} %exclude %{systemdunitdir}/plymouth*.service %exclude %{systemdunitdir}/systemd-ask-password-plymouth.* @@ -1282,8 +1286,6 @@ %{_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 @@ -1352,6 +1354,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.169 2012/05/30 12:16:44 baggins +- we have udevadm in /sbin +- always enable systemd-udev-settle.service and clean leftover udev-settle.service +- don't package udev services twice + Revision 1.168 2012/05/30 11:34:24 baggins - fix missing udev service renames ================================================================ Index: packages/systemd/udevadm-in-sbin.patch diff -u /dev/null packages/systemd/udevadm-in-sbin.patch:1.1 --- /dev/null Wed May 30 14:16:49 2012 +++ packages/systemd/udevadm-in-sbin.patch Wed May 30 14:16:44 2012 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.168&r2=1.169 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
