diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-01-07 11:09:57 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 11:31:20 +0000 |
| commit | 3fc5923b4c8e99fe22e10fb52181c951330a12f2 (patch) | |
| tree | 30485e382678b58ad3c6fe21fd3c86fa2d173c40 /meta | |
| parent | 28d625022d524eb8832f17e221679f68202401a2 (diff) | |
| download | openembedded-core-3fc5923b4c8e99fe22e10fb52181c951330a12f2.tar.gz openembedded-core-3fc5923b4c8e99fe22e10fb52181c951330a12f2.tar.bz2 openembedded-core-3fc5923b4c8e99fe22e10fb52181c951330a12f2.zip | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 4 | ||||
| -rw-r--r-- | 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 |