summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-16 14:19:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:35:19 +0100
commit242ad61580bdbeed354f65081f1ddb6f03cab257 (patch)
treefef961bddace95d191b1d890f77888fbc4122c64
parent5eae2d57b41f188a87e84904faf427d0a180c17a (diff)
downloadpoky-242ad61580bdbeed354f65081f1ddb6f03cab257.tar.gz
Revert "initrdscripts: look for new systemd-udevd location"
systemd-udevd is back in /lib, so revert this change. This reverts commit 27bb516be433ed9dcde6fe4a17d2429951a010a0. (From OE-Core rev: 3f6324a86cb8c1c253af06a1033ac71fa61c58d3) 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.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 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=""
11# Copied from initramfs-framework. The core of this script probably should be 11# Copied from initramfs-framework. The core of this script probably should be
12# turned into initramfs-framework modules to reduce duplication. 12# turned into initramfs-framework modules to reduce duplication.
13udev_daemon() { 13udev_daemon() {
14 OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /sbin/systemd/systemd-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
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() {
11} 11}
12 12
13udev_daemon() { 13udev_daemon() {
14 OPTIONS="/sbin/udev/udevd /sbin/udevd /lib/udev/udevd /sbin/systemd/systemd-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