From b8ea1c61b4b8071edf70f5d42119c54ea84de330 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 7 Sep 2015 13:05:42 +0200 Subject: initramfs-framework: support rootflags and rootfstype boot parameter These two parameters are supported by the kernel (https://www.kernel.org/doc/Documentation/kernel-parameters.txt). When an initramfs is used, the kernel does not mount the rootfs and the initramfs needs to react to them. The boot parameters can be set both by the image creator and by users. Supporting these two parameters is useful: - rootflags is needed to ensure that the rootfs is already mounted as intended in the time between starting init and init remounting it (as systemd does); this is critical for IMA where iversion must be active already when system starts writing files. - setting it correctly up-front avoids messages from the kernel ("cannot mount ... as ext2 because ...") when trying to guess the desired type. For example, assuming that only one of ext4/ext3/ext2 is set, rootfstype could be set in an image recipe with: APPEND_append = "${@''.join([' rootfstype=' + i for i in ['ext4', 'ext3', 'ext2'] if i in d.getVar('IMAGE_FSTYPES', True).split()])}" Signed-off-by: Patrick Ohly Signed-off-by: Ross Burton --- meta/recipes-core/initrdscripts/initramfs-framework/finish | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish index 325f47be40..006aef202f 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish @@ -22,7 +22,14 @@ finish_run() { fi if [ -e "$bootparam_root" ]; then - mount $bootparam_root $ROOTFS_DIR + flags="" + if [ -n "$bootparam_rootflags" ]; then + flags="$flags -o$bootparam_rootflags" + fi + if [ -n "$bootparam_rootfstype" ]; then + flags="$flags -t$bootparam_rootfstype" + fi + mount $flags $bootparam_root $ROOTFS_DIR else debug "root '$bootparam_root' doesn't exist." fi -- cgit 1.2.3-korg