diff options
author | Ross Burton <ross.burton@intel.com> | 2013-09-16 14:19:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 14:33:48 +0100 |
commit | 3f6324a86cb8c1c253af06a1033ac71fa61c58d3 (patch) | |
tree | 549501cdbc10f8760080621e97d42b9a6ce2861a | |
parent | aa6d9296e7c7e5b96d868d9c17d639b4f33ca18e (diff) | |
download | openembedded-core-3f6324a86cb8c1c253af06a1033ac71fa61c58d3.tar.gz openembedded-core-3f6324a86cb8c1c253af06a1033ac71fa61c58d3.tar.bz2 openembedded-core-3f6324a86cb8c1c253af06a1033ac71fa61c58d3.zip |
Revert "initrdscripts: look for new systemd-udevd location"
systemd-udevd is back in /lib, so revert this change.
This reverts commit 27bb516be433ed9dcde6fe4a17d2429951a010a0.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/initramfs-framework/udev | 2 |
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 df0076dd84..3f5fde83bf 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -11,7 +11,7 @@ ISOLINUX="" # Copied from initramfs-framework. The core of this script probably should be # turned into initramfs-framework modules to reduce duplication. udev_daemon() { - OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /sbin/systemd/systemd-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 18d44a5470..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/udev/udevd /sbin/udevd /lib/udev/udevd /sbin/systemd/systemd-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 |