From 7e17cba75c20ad820d30128d9b4b0132e7b924a8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 10 Apr 2013 11:47:31 +0100 Subject: initrdscripts: Add udev sbin based libexec path For better or worse we need to use base_sbindir for udev's libexec dir. This updates the initrdscripts to also cover the new location. I'd prevously assumed that it was already covered but its not. udev internal binaries shouldn't be in PATH so we have to do this to deal with the issue. Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-live.sh | 2 +- meta/recipes-core/initrdscripts/initramfs-framework/udev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initrdscripts') diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 4f8618ba4b..9fe1cd606c 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -12,7 +12,7 @@ UNIONFS="no" # Copied from initramfs-framework. The core of this script probably should be # turned into initramfs-framework modules to reduce duplication. udev_daemon() { - OPTIONS="/sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" + OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" for o in $OPTIONS; do if [ -x "$o" ]; then diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev index 50c934993d..bb462dc448 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/udev +++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev @@ -11,7 +11,7 @@ udev_shutdown_hook_handler() { } udev_daemon() { - OPTIONS="/sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" + OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" for o in $OPTIONS; do if [ -x "$o" ]; then -- cgit 1.2.3-korg