mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

initramfs-framework: overlayroot: align bootparams with module name

Browse Source 
Renaming the 'rootrw' kernel commandline parameter to
'overlayrootrwdev' to both align better with this modules name, and
point out the usage of the variable.

This patch also includes an if block to migrate the old 'rootrw'
block, should it be already used by someone.

(From OE-Core rev: a52b7f5c8ff3e50707b55843d9996983ab8efae2)

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:
Johannes Schneider
2024-02-13 13:24:25 +01:00
committed by Richard Purdie
parent 8a531d1990
commit e6047ee5e8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-core/initrdscripts/initramfs-framework/overlayroot
View File

@@ -15,7 +15,7 @@
# accessing the original, unmodified rootfs at /rofs after boot.
#
# It relies on the initramfs-module-rootfs to mount the original
# root filesystem, and requires 'rootrw=<foo>' to be passed as a
# root filesystem, and requires 'overlayrootrwdev=<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='
@@ -74,15 +74,19 @@ exit_gracefully() {
eval "finish_run"
}
# migrate legacy parameter
if [ ! -z "$bootparam_rootrw" ]; then
bootparam_overlayrootrwdev="$bootparam_rootrw"
fi
if [ -z "$bootparam_rootrw" ]; then
exit_gracefully "rootrw= kernel parameter doesn't exist and its required to mount the overlayfs"
if [ -z "$bootparam_overlayrootrwdev" ]; then
exit_gracefully "overlayrootrwdev= kernel parameter doesn't exist and its required to mount the overlayfs"
fi
mkdir -p ${RWMOUNT}
# Mount RW device
if mount -n -t ${bootparam_overlayrootfstype:-ext4} -o ${bootparam_overlayrootfsflags:-defaults} ${bootparam_rootrw} ${RWMOUNT}
if mount -n -t ${bootparam_overlayrootfstype:-ext4} -o ${bootparam_overlayrootfsflags:-defaults} ${bootparam_overlayrootrwdev} ${RWMOUNT}
then
# Set up overlay directories
mkdir -p ${UPPER_DIR}