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>

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 4f8618ba4b997a36fab5e05bbfc7b484eaf8f75f..9fe1cd606cc9c7aa32783c2426bded951e43cf8f 100644 (file)
--- 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 50c934993d2ce7224acd563002b33630b81c87a1..bb462dc4488d98b58a01618be68c44d8db0ac4ad 100644 (file)
--- 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