summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 11:47:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 11:49:04 +0100
commit51cc49dddaf88bdebed83189e3b59c2ff77842b9 (patch)
tree45d7bd605287e9768b9d56c7ae043d3a1387c20e
parent1b93e2bc913af90b6a8274215ae9848ee628198b (diff)
downloadpoky-51cc49dddaf88bdebed83189e3b59c2ff77842b9.tar.gz
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. (From OE-Core rev: 7e17cba75c20ad820d30128d9b4b0132e7b924a8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework/udev2
2 files changed, 2 insertions, 2 deletions
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"
12# Copied from initramfs-framework. The core of this script probably should be 12# Copied from initramfs-framework. The core of this script probably should be
13# turned into initramfs-framework modules to reduce duplication. 13# turned into initramfs-framework modules to reduce duplication.
14udev_daemon() { 14udev_daemon() {
15 OPTIONS="/sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" 15 OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd"
16 16
17 for o in $OPTIONS; do 17 for o in $OPTIONS; do
18 if [ -x "$o" ]; then 18 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() {
11} 11}
12 12
13udev_daemon() { 13udev_daemon() {
14 OPTIONS="/sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd" 14 OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /lib/systemd/systemd-udevd"
15 15
16 for o in $OPTIONS; do 16 for o in $OPTIONS; do
17 if [ -x "$o" ]; then 17 if [ -x "$o" ]; then