diff mbox series

[v2] initramfs-framework: remove hard dependency with busybox

Message ID 20250407164456.4845-1-gavrosc@yahoo.com
State New
Headers show
Series [v2] initramfs-framework: remove hard dependency with busybox | expand

Commit Message

Christos Gavros April 7, 2025, 4:44 p.m. UTC
In 'finish'script the Switch_root command with option -c is busybox specific.
When package-core-base-utils is selected the boot is breaking with message
"Switch_root: invalid option — ‘c’.It was reproduced using qemu.
Remove -c option to make it compatible with both providers.
It is tested using qemu with busybox and package-core-base-utils. In both cases
qemu boots successfully and filesystem is accessible.
Fixes [YOCTO #15716]

CC: Yoann Congal <yoann.congal@smile.fr>
CC: Randy MacLeod <randy.macleod@windriver.com>
CC: jbk <jbk@mm-software.com>
CC: Raj Khem <raj.khem@gmail.com>
CC: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Christos Gavros <gavrosc@yahoo.com>
---
v1->v2
* the commit message is extended with more info
---
 meta/recipes-core/initrdscripts/initramfs-framework/finish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj April 7, 2025, 5:04 p.m. UTC | #1
On Mon, Apr 7, 2025 at 9:45 AM Christos Gavros <gavrosc@yahoo.com> wrote:
>
> In 'finish'script the Switch_root command with option -c is busybox specific.
> When package-core-base-utils is selected the boot is breaking with message
> "Switch_root: invalid option — ‘c’.It was reproduced using qemu.
> Remove -c option to make it compatible with both providers.
> It is tested using qemu with busybox and package-core-base-utils. In both cases
> qemu boots successfully and filesystem is accessible.
> Fixes [YOCTO #15716]
>


Looks good

> CC: Yoann Congal <yoann.congal@smile.fr>
> CC: Randy MacLeod <randy.macleod@windriver.com>
> CC: jbk <jbk@mm-software.com>
> CC: Raj Khem <raj.khem@gmail.com>
> CC: Adrian Freihofer <adrian.freihofer@gmail.com>
> Signed-off-by: Christos Gavros <gavrosc@yahoo.com>
> ---
> v1->v2
> * the commit message is extended with more info
> ---
>  meta/recipes-core/initrdscripts/initramfs-framework/finish | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish
> index ac0de9f996..716c2f44af 100755
> --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish
> +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish
> @@ -41,7 +41,7 @@ finish_run() {
>                 mount --move /sys $ROOTFS_DIR/sys
>
>                 cd $ROOTFS_DIR
> -               exec switch_root -c /dev/console $ROOTFS_DIR ${bootparam_init:-/sbin/init}
> +               exec switch_root $ROOTFS_DIR ${bootparam_init:-/sbin/init}
>         else
>                 debug "No rootfs has been set"
>         fi
> --
> 2.34.1
>
diff mbox series

Patch

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish
index ac0de9f996..716c2f44af 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/finish
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish
@@ -41,7 +41,7 @@  finish_run() {
 		mount --move /sys $ROOTFS_DIR/sys
 
 		cd $ROOTFS_DIR
-		exec switch_root -c /dev/console $ROOTFS_DIR ${bootparam_init:-/sbin/init}
+		exec switch_root $ROOTFS_DIR ${bootparam_init:-/sbin/init}
 	else
 		debug "No rootfs has been set"
 	fi