diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-20 16:30:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-20 16:30:14 +0200 |
| commit | 424888e47431db738f5f9b3c6392435bfce7a842 (patch) | |
| tree | 1c1c8dd27aa6b58b685bf8e52a887d560edb0aef | |
| parent | 8a6f23a42409a0784ffa38c262b50516516e56ef (diff) | |
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>
| -rwxr-xr-x | fs/initramfs/init | 4 | ||||
| -rw-r--r-- | fs/initramfs/initramfs.mk | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/fs/initramfs/init b/fs/initramfs/init new file mode 100755 index 000000000..751cb270f --- /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 73122a841..1cd48b6c8 100644 --- 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) > $$@ |