summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-12 16:18:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-13 15:21:41 (GMT)
commit0140519ba15bfb27ccbfb3d41c7e678a1118fc5c (patch)
tree750b20a70172c70d847ed88a8dd7de761cf51aeb
parent82295b9bbd5dfd922786f815626863323f7f4ea4 (diff)
downloadpoky-0140519ba15bfb27ccbfb3d41c7e678a1118fc5c.tar.gz
initrdscripts: fix udevd in the live boot init scripts
udevd moved location and isn't in $PATH anymore, so use an absolute path to start it. The control socket path moved too, so mkdir the directory it's in. Mounts the new devtmpfs on /dev device tree. (From OE-Core rev: 75f28875bcae2f91437d89d1ad97df29226e3303) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexandru Damian <alexandru.damian@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-framework/udev6
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb2
4 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 5682fd1..c591f0d 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -14,12 +14,14 @@ 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
17 18
18 # support modular kernel 19 # support modular kernel
19 modprobe isofs 2> /dev/null 20 modprobe isofs 2> /dev/null
20 21
21 mkdir -p /run 22 mkdir -p /run
22 udevd --daemon 23 mkdir -p /var/run
24 /lib/udev/udevd --daemon
23 udevadm trigger --action=add 25 udevadm trigger --action=add
24} 26}
25 27
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev
index 9ea8aa3..15a1d5b 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/udev
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev
@@ -3,8 +3,8 @@
3# Licensed on MIT 3# Licensed on MIT
4 4
5udev_enabled() { 5udev_enabled() {
6 if [ ! -e /sbin/udevd ]; then 6 if [ ! -e /lib/udev/udevd ]; then
7 debug "/sbin/udev doesn't exist" 7 debug "/lib/udev/udev doesn't exist"
8 return 1 8 return 1
9 fi 9 fi
10 10
@@ -14,7 +14,7 @@ udev_enabled() {
14udev_run() { 14udev_run() {
15 mkdir -p /run 15 mkdir -p /run
16 16
17 udevd --daemon > /dev/null 17 /lib/udev/udevd --daemon > /dev/null
18 udevadm trigger --action=add 18 udevadm trigger --action=add
19 udevadm settle 19 udevadm settle
20 20
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 58e41d4..45d6592 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -3,6 +3,8 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4RDEPENDS = "busybox" 4RDEPENDS = "busybox"
5 5
6PR = "r1"
7
6inherit allarch 8inherit allarch
7 9
8SRC_URI = "file://init \ 10SRC_URI = "file://init \
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 137a401..55a8600 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 = "r10" 8PR = "r11"
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