mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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 <johannes.schneider@leica-geosystems.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
de27ecd228
commit
8a531d1990
@@ -18,6 +18,8 @@
|
||||
# root filesystem, and requires 'rootrw=<foo>' 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}
|
||||
|
||||
Reference in New Issue
Block a user