From 8a531d19909682ec2f4d373053cb8a9854f1399b Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Tue, 13 Feb 2024 13:24:24 +0100 Subject: [PATCH] initramfs-framework: overlayroot: fix kernel commandline clash The initramfs-framwork takes kernel commandline options and converts them for internal use to variables following the 'bootparam_name' pattern. The overlayroot module uses 'bootparam_rootfstype' and 'bootparam_rootfsflags' which both collide with linux kernel parameters 'rootfstype' and 'rootfsflags'. This collision is solved by putting the variables in the namespace of the initramfs-framework module. (From OE-Core rev: ef20ef719c699b94fc52b81c520faa0b3714efeb) Signed-off-by: Johannes Schneider Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../initrdscripts/initramfs-framework/overlayroot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/overlayroot b/meta/recipes-core/initrdscripts/initramfs-framework/overlayroot index d40342dc59..10084228a8 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/overlayroot +++ b/meta/recipes-core/initrdscripts/initramfs-framework/overlayroot @@ -18,6 +18,8 @@ # root filesystem, and requires 'rootrw=' to be passed as a # kernel parameter, specifying the device/partition intended to # use as RW. +# Mount options of the RW device can be tweaked with 'overlayrootfstype=' +# (defaults to 'ext4') and 'overlayrootfsflags=' ('defaults'). # # This module needs to be executed after the initramfs-module-rootfs # since it relies on it to mount the filesystem at initramfs startup @@ -80,7 +82,7 @@ fi mkdir -p ${RWMOUNT} # Mount RW device -if mount -n -t ${bootparam_rootfstype:-ext4} -o ${bootparam_rootflags:-defaults} ${bootparam_rootrw} ${RWMOUNT} +if mount -n -t ${bootparam_overlayrootfstype:-ext4} -o ${bootparam_overlayrootfsflags:-defaults} ${bootparam_rootrw} ${RWMOUNT} then # Set up overlay directories mkdir -p ${UPPER_DIR}