X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=udevadm-in-sbin.patch;h=75a6fcd5d9f8b45a05337d1fa6030f649990ab34;hb=acd853888198d6083e5f470cd70009356343973a;hp=4eb53e41d4ad7d56abd8b8ba3d49517270329d81;hpb=a5e88385fa3e1fe2cc4cc560563e8159a570884a;p=packages%2Fsystemd.git

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index 4eb53e4..75a6fcd 100644
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -1,19 +1,34 @@
+--- systemd-183/Makefile.am~	2012-05-30 14:28:53.647009365 +0200
++++ systemd-183/Makefile.am	2012-05-30 14:35:41.593661644 +0200
+@@ -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
-@@ -29,7 +29,7 @@
+@@ -29,4 +29,4 @@
  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 @@
  
- [Install]
- WantedBy=basic.target
+ [Service]
+ Type=oneshot
+-ExecStart=-@rootbindir@/udevadm info --cleanup-db
++ExecStart=-@sbindir@/udevadm info --cleanup-db