diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-11-12 16:18:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-12 22:30:19 +0000 |
| commit | 543606e5dc379497c34196d004a214e847f5db2d (patch) | |
| tree | 4953d3562739abffb255010c62f72f3e71fbf59f /meta/recipes-core/initrdscripts | |
| parent | 713e1c82d32a477be84951d1dba8326b0342c8ca (diff) | |
| download | openembedded-core-543606e5dc379497c34196d004a214e847f5db2d.tar.gz openembedded-core-543606e5dc379497c34196d004a214e847f5db2d.tar.bz2 openembedded-core-543606e5dc379497c34196d004a214e847f5db2d.zip | |
initrdscripts: fix udevd in the live boot init scripts
udevd moved location and isn't in $PATH anymore, so use an absolute path to
start it.
The control socket path moved too, so mkdir the directory it's in.
Mounts the new devtmpfs on /dev device tree.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexandru Damian <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts')
4 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 5682fd18c1..c591f0d386 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -14,12 +14,14 @@ early_setup() { mkdir -p /sys mount -t proc proc /proc mount -t sysfs sysfs /sys + mount -t devtmpfs none /dev # support modular kernel modprobe isofs 2> /dev/null mkdir -p /run - udevd --daemon + mkdir -p /var/run + /lib/udev/udevd --daemon udevadm trigger --action=add } diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev index 9ea8aa3641..15a1d5ba06 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/udev +++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev @@ -3,8 +3,8 @@ # Licensed on MIT udev_enabled() { - if [ ! -e /sbin/udevd ]; then - debug "/sbin/udev doesn't exist" + if [ ! -e /lib/udev/udevd ]; then + debug "/lib/udev/udev doesn't exist" return 1 fi @@ -14,7 +14,7 @@ udev_enabled() { udev_run() { mkdir -p /run - udevd --daemon > /dev/null + /lib/udev/udevd --daemon > /dev/null udevadm trigger --action=add udevadm settle diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 58e41d4d4c..45d6592bc3 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -3,6 +3,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS = "busybox" +PR = "r1" + inherit allarch SRC_URI = "file://init \ diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index 137a40106e..55a8600ba4 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb @@ -5,7 +5,7 @@ RDEPENDS = "udev" DEPENDS = "virtual/kernel" SRC_URI = "file://init-live.sh" -PR = "r10" +PR = "r11" do_compile() { #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then |