diff options
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 5682fd18c1..c591f0d386 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 9ea8aa3641..15a1d5ba06 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 | ||
| 5 | udev_enabled() { | 5 | udev_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() { | |||
| 14 | udev_run() { | 14 | udev_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 58e41d4d4c..45d6592bc3 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" | |||
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 4 | RDEPENDS = "busybox" | 4 | RDEPENDS = "busybox" |
| 5 | 5 | ||
| 6 | PR = "r1" | ||
| 7 | |||
| 6 | inherit allarch | 8 | inherit allarch |
| 7 | 9 | ||
| 8 | SRC_URI = "file://init \ | 10 | SRC_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 137a40106e..55a8600ba4 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" | |||
| 5 | DEPENDS = "virtual/kernel" | 5 | DEPENDS = "virtual/kernel" |
| 6 | SRC_URI = "file://init-live.sh" | 6 | SRC_URI = "file://init-live.sh" |
| 7 | 7 | ||
| 8 | PR = "r10" | 8 | PR = "r11" |
| 9 | 9 | ||
| 10 | do_compile() { | 10 | do_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 |
