Commit 3fac21ef authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

cpio: fix boot with dynamic /dev 



Devtmpfs doesn't get automounted by the kernel when an initramfs is used.
Since cpio archives are used almost exclusively as an initramfs, the same
fix should be applied to it as for the initramfs.

Cfr. commit 424888e4 and
10a130f9.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 0a775837

fs/cpio/cpio.mk

+19 −5
Original line number Diff line number Diff line
@@ -4,12 +4,26 @@ 
#

#############################################################



define ROOTFS_CPIO_INIT_SYMLINK

	rm -f $(TARGET_DIR)/init

	ln -s sbin/init $(TARGET_DIR)/init

ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)



define ROOTFS_CPIO_ADD_INIT

        if [ ! -e $(TARGET_DIR)/init ]; then \

                ln -sf sbin/init $(TARGET_DIR)/init; \

        fi

endef



else

# devtmpfs does not get automounted when initramfs is used.

# Add a pre-init script to mount it before running init

define ROOTFS_CPIO_ADD_INIT

        if [ ! -e $(TARGET_DIR)/init ]; then \

                $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \

        fi

endef



ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK

endif # BR2_ROOTFS_DEVICE_CREATION_STATIC



ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT



define ROOTFS_CPIO_CMD

	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@

fs/cpio/init

0 → 100755
+7 −0
Original line number Diff line number Diff line 
#!/bin/sh

# devtmpfs does not get automounted for initramfs

/bin/mount -t devtmpfs devtmpfs /dev

exec 0</dev/console

exec 1>/dev/console

exec 2>/dev/console

exec /sbin/init $*