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 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index c591f0d3862355661609030b074fb3a3eac56016..5682fd18c17ecf18208d7c8e4d85144baf9ba058 100644 (file)
--- 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 55a8600ba4960fa2f5dfc6ca25829d701b35fe23..a41b66b0a1a4fb9fcc880b9510f88b69aef8e5f8 100644 (file)
--- 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