diff options
| author | Michael Biebl <biebl@debian.org> | 2013-03-11 07:17:39 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-03-11 07:18:33 +0100 |
| commit | f432bb914499e2c28b43f592bb273f0a8664f352 (patch) | |
| tree | 055b0840d30817c7c2842f835c7ee3de6cff6028 /src | |
| parent | 0876dc1c26b123c3f955e0a34da6ab0375786cea (diff) | |
Move udevadm to rootbindir
The udevadm utility is needed during early boot, so move it to
rootbindir to support split-/usr configurations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/macros.systemd.in | 4 | ||||
| -rw-r--r-- | src/login/71-seat.rules.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in index 647cce6913..f77082c2db 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -61,11 +61,11 @@ fi \ %{nil} %udev_hwdb_update() \ -@bindir@/udevadm hwdb --update >/dev/null 2>&1 || : \ +@rootbindir@/udevadm hwdb --update >/dev/null 2>&1 || : \ %{nil} %udev_rules_update() \ -@bindir@/udevadm control --reload >/dev/null 2>&1 || : \ +@rootbindir@/udevadm control --reload >/dev/null 2>&1 || : \ %{nil} %journal_catalog_update() \ diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in index a064de4b5e..ad26acbbb3 100644 --- a/src/login/71-seat.rules.in +++ b/src/login/71-seat.rules.in @@ -38,7 +38,7 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{idProduct}=="401a", ATTR{product} SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{idProduct}=="401a", ATTR{product}=="mimo inc", \ ATTR{../idVendor}=="058f", ATTR{../idProduct}=="6254", \ ENV{ID_AVOID_LOOP}=="", \ - RUN+="@bindir@/udevadm trigger --parent-match=%p/.." + RUN+="@rootbindir@/udevadm trigger --parent-match=%p/.." TAG=="seat", ENV{ID_PATH}=="", IMPORT{builtin}="path_id" TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}" |