initramfs: fix boot with dynamic /dev

Devtmpfs (which is used by devtmpfs/mdev/udev options) doesn't get
automounted by the kernel when an initramfs is used, causing boot
failures when a dynamic /dev is used.

Fix it by adding a pre-init script to mount devtmpfs before running init.

Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/fs/initramfs/init b/fs/initramfs/init
new file mode 100755 (executable)
index 0000000..751cb27
--- /dev/null
+++ b/fs/initramfs/init
@@ -0,0 +1,4 @@
+#!/bin/sh
+# devtmpfs does not get automounted for initramfs
+/bin/mount -t devtmpfs devtmpfs /dev
+exec /sbin/init $*

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 73122a841126f113e3ac27caf331c2c968323cdf..1cd48b6c8ba233f9cfc2a5892ce9017803f09a82 100644 (file)
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -6,13 +6,26 @@
 #
 #############################################################
 
-define ROOTFS_INITRAMFS_INIT_SYMLINK
+ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+
+define ROOTFS_INITRAMFS_ADD_INIT
        if [ ! -e $(TARGET_DIR)/init ]; then \
                ln -sf sbin/init $(TARGET_DIR)/init; \
        fi
 endef
 
-ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_INIT_SYMLINK
+else
+# devtmpfs does not get automounted when initramfs is used.
+# Add a pre-init script to mount it before running init
+define ROOTFS_INITRAMFS_ADD_INIT
+       if [ ! -e $(TARGET_DIR)/init ]; then \
+               $(INSTALL) -m 0755 fs/initramfs/init $(TARGET_DIR)/init; \
+       fi
+endef
+
+endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
+
+ROOTFS_INITRAMFS_PRE_GEN_HOOKS += ROOTFS_INITRAMFS_ADD_INIT
 
 define ROOTFS_INITRAMFS_CMD
        $(SHELL) fs/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@