summaryrefslogtreecommitdiff
path: root/meta/recipes-core
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:47:38 +0100
commit7e17cba75c20ad820d30128d9b4b0132e7b924a8 (patch)
tree14b4e637ef44058368b7f0e1aafaf6e3ecd03f28 /meta/recipes-core
parente2915b6e1d2088d3a791bf629dabc58f38940961 (diff)
downloadopenembedded-core-7e17cba75c20ad820d30128d9b4b0132e7b924a8.tar.gz
openembedded-core-7e17cba75c20ad820d30128d9b4b0132e7b924a8.tar.bz2
openembedded-core-7e17cba75c20ad820d30128d9b4b0132e7b924a8.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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"
# 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