From 74ce6dd99cd9237bbe7d7d55dc27ceba0b7749b8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 7 Jan 2013 11:09:57 +0000 Subject: Revert "initrdscripts: fix udevd in the live boot init scripts" This cherry-pick slipped through testing and lead to unbootable hddimg images. This reverts commit 0140519ba15bfb27ccbfb3d41c7e678a1118fc5c. [ YOCTO #3634 ] (From OE-Core rev: 3fc5923b4c8e99fe22e10fb52181c951330a12f2) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-live.sh | 4 +--- meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index c591f0d386..5682fd18c1 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -14,14 +14,12 @@ 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 - mkdir -p /var/run - /lib/udev/udevd --daemon + udevd --daemon udevadm trigger --action=add } 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 55a8600ba4..a41b66b0a1 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 = "r11" +PR = "r12" do_compile() { #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then -- cgit v1.2.3-54-g00ecf