[oe-commits] Ross Burton : Revert "initrdscripts: fix udevd in the live boot init scripts"
git at git.openembedded.org
git at git.openembedded.org
Mon Jan 7 11:35:55 UTC 2013
Module: openembedded-core.git
Branch: danny
Commit: 3fc5923b4c8e99fe22e10fb52181c951330a12f2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3fc5923b4c8e99fe22e10fb52181c951330a12f2
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Jan 7 11:09:57 2013 +0000
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 4 +---
.../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
More information about the Openembedded-commits
mailing list