- x32 rebuild

[packages/systemd.git] / udevadm-in-sbin.patch

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index e0d5d29f0bb1994f818c2b1b2594b82c2423e5a8..75a6fcd5d9f8b45a05337d1fa6030f649990ab34 100644 (file)
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -1,20 +1,20 @@
 --- systemd-183/Makefile.am~   2012-05-30 14:28:53.647009365 +0200
 +++ systemd-183/Makefile.am    2012-05-30 14:35:41.593661644 +0200
-@@ -2965,6 +2965,7 @@
-       $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-               -e 's,@rootbindir\@,$(rootbindir),g' \
-               -e 's,@bindir\@,$(bindir),g' \
-+              -e 's,@sbindir\@,$(sbindir),g' \
-               -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-               -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-               -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+@@ -3817,6 +3817,7 @@
+        '|rootlibexecdir=$(rootlibexecdir)|' \
+        '|rootbindir=$(rootbindir)|' \
+        '|bindir=$(bindir)|' \
++       '|sbindir=$(sbindir)|' \
+        '|SYSTEMCTL=$(rootbindir)/systemctl|' \
+        '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
+        '|pkgsysconfdir=$(pkgsysconfdir)|' \
 --- 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=@rootbindir@/udevadm trigger --type=subsystems --action=add ; @rootbindir@/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
@@ -22,5 +22,13 @@
  Type=oneshot
  TimeoutSec=180
  RemainAfterExit=yes
--ExecStart=@bindir@/udevadm settle
+-ExecStart=@rootbindir@/udevadm settle
 +ExecStart=@sbindir@/udevadm settle
+--- systemd-199/units/initrd-udevadm-cleanup-db.service.in~    2013-03-11 18:01:33.616138706 +0100
++++ systemd-199/units/initrd-udevadm-cleanup-db.service.in     2013-03-26 19:09:54.525625477 +0100
+@@ -15,4 +15,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=-@rootbindir@/udevadm info --cleanup-db
++ExecStart=-@sbindir@/udevadm info --cleanup-db