Boot entries no longer need to put their Kernel command line options into global.linux.bootargs.dyn.*, as boot_entry() reverts all changes to global.linux.bootargs.* when the boot entry returns. Use plain names in the net and dfu boot entries, the boot entry template and the matching example in the documentation.
Unlike the dyn.ip and dyn.root variables, which bootscript_boot() creates for compatibility with existing boot scripts, the new variables don't exist beforehand, so create them with the global command. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Sascha Hauer <[email protected]> --- Documentation/user/booting-linux.rst | 5 +++-- defaultenv/defaultenv-2-base/boot/net | 5 +++-- defaultenv/defaultenv-2-base/data/boot-template | 2 +- defaultenv/defaultenv-2-dfu/boot/dfu | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Documentation/user/booting-linux.rst b/Documentation/user/booting-linux.rst index 158aa8b313..85f7694fe8 100644 --- a/Documentation/user/booting-linux.rst +++ b/Documentation/user/booting-linux.rst @@ -442,9 +442,10 @@ If the preconfigured paths or names are not suitable, they can be adjusted in fi nfsroot="/home/${global.user}/nfsroot/${global.hostname}" - ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip + global linux.bootargs.ip + ip_route_get -b ${global.net.server} global.linux.bootargs.ip - global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" + global linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" ``boot net`` will then retrieve the kernel (and also the device tree and initramfs, if used) over TFTP and boot it. diff --git a/defaultenv/defaultenv-2-base/boot/net b/defaultenv/defaultenv-2-base/boot/net index 8408ceaf39..f025bb4098 100644 --- a/defaultenv/defaultenv-2-base/boot/net +++ b/defaultenv/defaultenv-2-base/boot/net @@ -23,6 +23,7 @@ if [ -f "${initramfs}" ]; then global.bootm.initrd="$initramfs" else nfsroot="${nfsserver}:/home/${global.user}/nfsroot/${global.hostname}" - ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip - global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" + global linux.bootargs.ip + ip_route_get -b ${global.net.server} global.linux.bootargs.ip + global linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" fi diff --git a/defaultenv/defaultenv-2-base/data/boot-template b/defaultenv/defaultenv-2-base/data/boot-template index 689d98e1e9..b63eb86d1a 100644 --- a/defaultenv/defaultenv-2-base/data/boot-template +++ b/defaultenv/defaultenv-2-base/data/boot-template @@ -6,4 +6,4 @@ global.bootm.image=<path to image> #bootargs-ip -global.linux.bootargs.dyn.root="root=<rootfs here>" +global linux.bootargs.root="root=<rootfs here>" diff --git a/defaultenv/defaultenv-2-dfu/boot/dfu b/defaultenv/defaultenv-2-dfu/boot/dfu index 682091141e..56a88ae0a3 100644 --- a/defaultenv/defaultenv-2-dfu/boot/dfu +++ b/defaultenv/defaultenv-2-dfu/boot/dfu @@ -23,8 +23,8 @@ if [ ! -f "$kernel" ]; then fi if [ -f "$cmdline" ]; then - global linux.bootargs.dyn.dfu - readf $cmdline global.linux.bootargs.dyn.dfu + global linux.bootargs.dfu + readf $cmdline global.linux.bootargs.dfu fi if [ -f "$dtb" ]; then -- 2.47.3
