From patchwork Mon Jan 7 11:09:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/7] Revert "initrdscripts: fix udevd in the live boot init scripts" Date: Mon, 07 Jan 2013 11:09:57 -0000 From: Ross Burton X-Patchwork-Id: 42163 Message-Id: <1357557002-22183-3-git-send-email-ross.burton@intel.com> To: openembedded-core@lists.openembedded.org This cherry-pick slipped through testing and lead to unbootable hddimg images. This reverts commit 0140519ba15bfb27ccbfb3d41c7e678a1118fc5c. [ YOCTO #3634 ] Signed-off-by: Ross Burton --- 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 c591f0d..5682fd1 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 55a8600..a41b66b 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