[oe-commits] Ross Burton : initramfs-live-boot: handle multiple udev locations
git at git.openembedded.org
git at git.openembedded.org
Fri Jan 18 13:31:17 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: a5de76317112fc065a78a745c2f23775dca15d75
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a5de76317112fc065a78a745c2f23775dca15d75
Author: Ross Burton <ross.burton at intel.com>
Date: Thu Jan 17 16:29:39 2013 +0000
initramfs-live-boot: handle multiple udev locations
udevd isn't on $PATH and is in different places depending on what version of
udev is being used. Copy the code from initramfs-framework to search for the
right udevd at boot time instead of hard-coding a location.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 0ae359d..f0d4f22 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -9,6 +9,23 @@ UMOUNT="/bin/umount"
ISOLINUX=""
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"
+
+ for o in $OPTIONS; do
+ if [ -x "$o" ]; then
+ echo $o
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+_UDEV_DAEMON=`udev_daemon`
+
early_setup() {
mkdir -p /proc
mkdir -p /sys
@@ -21,7 +38,8 @@ early_setup() {
mkdir -p /run
mkdir -p /var/run
- /lib/udev/udevd --daemon
+
+ $_UDEV_DAEMON --daemon
udevadm trigger --action=add
}
More information about the Openembedded-commits
mailing list