diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-04-11 17:28:25 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-13 23:52:43 +0100 |
| commit | d612ca261d12e89e96675c24d9d7456319179720 (patch) | |
| tree | a4e0d3f210e7c4318915d7a7c80386351a28b0cb /meta/recipes-core/systemd/systemd/init | |
| parent | b847f87f4213db917d6760cd399c0afae996cf23 (diff) | |
| download | openembedded-core-contrib-d612ca261d12e89e96675c24d9d7456319179720.tar.gz | |
systemd: move the binaries to /sbin/systemd
As with udev, placing binaries in /lib breaks our current multilib
implementation. Change the rootlibexecdir to /sbin/systemd so that binaries
don't move in multilib situations.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/init')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/init | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd/init b/meta/recipes-core/systemd/systemd/init index 0ddd0434f2..32a474d72d 100644 --- a/meta/recipes-core/systemd/systemd/init +++ b/meta/recipes-core/systemd/systemd/init @@ -15,7 +15,7 @@ export TZ=/etc/localtime [ -d /sys/class ] || exit 1 [ -r /proc/mounts ] || exit 1 -[ -x /lib/systemd/systemd-udevd ] || exit 1 +[ -x @UDEVD@ ] || exit 1 [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf @@ -71,15 +71,15 @@ case "$1" in # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - /lib/systemd/systemd-udevd -d + @UDEVD@ -d - /usr/bin/udevadm control --env=STARTUP=1 + udevadm control --env=STARTUP=1 if [ "$not_first_boot" != "" ];then - /usr/bin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/usr/bin/udevadm settle --timeout=3; /usr/bin/udevadm control --env=STARTUP=)& + udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform + (udevadm settle --timeout=3; udevadm control --env=STARTUP=)& else - /usr/bin/udevadm trigger --action=add - /usr/bin/udevadm settle + udevadm trigger --action=add + udevadm settle fi ;; stop) |