shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

Move udevadm to rootbindir

Browse Source 
The udevadm utility is needed during early boot, so move it to
rootbindir to support split-/usr configurations.
This commit is contained in:
Michael Biebl 2013-03-11 07:17:39 +01:00
parent 0876dc1c26
commit f432bb9144
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1785,7 +1785,7 @@ SYSINIT_TARGET_WANTS += \
systemd-udevd.service \
systemd-udev-trigger.service
bin_PROGRAMS += \
rootbin_PROGRAMS += \
udevadm
rootlibexec_PROGRAMS += \
@ -1871,7 +1871,7 @@ udevadm_LDADD = \
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
hwdb-update-hook:
-test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update
-test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update
INSTALL_DATA_HOOKS += \
hwdb-update-hook

4
src/core/macros.systemd.in
View File

@ -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() \

2
src/login/71-seat.rules.in
View File

@ -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}"

2
units/initrd-udevadm-cleanup-db.service.in
View File

@ -15,4 +15,4 @@ Before=initrd-switch-root.target
[Service]
Type=oneshot
ExecStart=-@bindir@/udevadm info --cleanup-db
ExecStart=-@rootbindir@/udevadm info --cleanup-db

2
units/systemd-udev-settle.service.in
View File

@ -27,4 +27,4 @@ ConditionCapability=CAP_MKNOD
Type=oneshot
TimeoutSec=180
RemainAfterExit=yes
ExecStart=@bindir@/udevadm settle
ExecStart=@rootbindir@/udevadm settle

2
units/systemd-udev-trigger.service.in
View File

@ -16,4 +16,4 @@ ConditionCapability=CAP_MKNOD
[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