blspec and extlinux pass the options of a boot entry to the Kernel in
global.linux.bootargs.dyn.bootentries. The dyn infix used to be
necessary for boot_entry() to clear the variable again after a boot
entry returned. Now that boot_entry() reverts all changes to
global.linux.bootargs.* anyway, it no longer carries any meaning, so
name the variable global.linux.bootargs.bootentries.

As the variables are concatenated in lexicographical order, the boot
entry options may end up at a different position in the command line.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Sascha Hauer <[email protected]>
---
 common/blspec.c   | 2 +-
 common/extlinux.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/blspec.c b/common/blspec.c
index 0552e93b79..e2fa4956e9 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -128,7 +128,7 @@ static int blspec_boot(struct bootentry *be, int verbose, 
int dryrun)
        if (initrd)
                data.initrd_file = basprintf("%s/%s", abspath, initrd);
 
-       globalvar_add_simple("linux.bootargs.dyn.bootentries", options);
+       globalvar_add_simple("linux.bootargs.bootentries", options);
 
        appendroot = blspec_entry_var_get(entry, "linux-appendroot");
        if (appendroot) {
diff --git a/common/extlinux.c b/common/extlinux.c
index 1976fe09aa..f502bffc7d 100644
--- a/common/extlinux.c
+++ b/common/extlinux.c
@@ -68,7 +68,7 @@ static int extlinux_boot(struct bootentry *entry, int 
verbose, int dryrun)
        }
 
        if (e->append)
-               globalvar_add_simple("linux.bootargs.dyn.bootentries",
+               globalvar_add_simple("linux.bootargs.bootentries",
                                     e->append);
 
        pr_info("Booting extlinux label '%s'\n", e->label);

-- 
2.47.3


Reply via email to