[oe-commits] Ross Burton : Revert "initrdscripts: look for new systemd-udevd location"
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 17 13:23:52 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 3f6324a86cb8c1c253af06a1033ac71fa61c58d3
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3f6324a86cb8c1c253af06a1033ac71fa61c58d3
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Sep 16 14:19:33 2013 +0000
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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 2 +-
.../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 df0076d..3f5fde8 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 18d44a5..bb462dc 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
More information about the Openembedded-commits
mailing list