summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-07 11:09:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 11:32:13 (GMT)
commit74ce6dd99cd9237bbe7d7d55dc27ceba0b7749b8 (patch)
treefd8d9882ad2a1c214e1518051b73ea5031dfecf5
parent02f6806cf248e535361eabdd51be1030fc41b647 (diff)
downloadpoky-74ce6dd99cd9237bbe7d7d55dc27ceba0b7749b8.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh4
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb2
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() {
14 mkdir -p /sys 14 mkdir -p /sys
15 mount -t proc proc /proc 15 mount -t proc proc /proc
16 mount -t sysfs sysfs /sys 16 mount -t sysfs sysfs /sys
17 mount -t devtmpfs none /dev
18 17
19 # support modular kernel 18 # support modular kernel
20 modprobe isofs 2> /dev/null 19 modprobe isofs 2> /dev/null
21 20
22 mkdir -p /run 21 mkdir -p /run
23 mkdir -p /var/run 22 udevd --daemon
24 /lib/udev/udevd --daemon
25 udevadm trigger --action=add 23 udevadm trigger --action=add
26} 24}
27 25
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"
5DEPENDS = "virtual/kernel" 5DEPENDS = "virtual/kernel"
6SRC_URI = "file://init-live.sh" 6SRC_URI = "file://init-live.sh"
7 7
8PR = "r11" 8PR = "r12"
9 9
10do_compile() { 10do_compile() {
11 #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then 11 #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then