global.linux.bootargs.dyn.* variables are exclusively used in boot
scripts, so create them right before executing a script. This moves
the corresponding code from the unrelated startup code to the place
where the variables are used.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
common/boot.c | 2 ++
common/startup.c | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/common/boot.c b/common/boot.c
index 974eaf5d02..84b2ff9677 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -92,6 +92,8 @@ static int bootscript_boot(struct bootentry *entry, int verbose, int dryrun)
return 0;
}
+ globalvar_add_simple("linux.bootargs.dyn.ip", NULL);
+ globalvar_add_simple("linux.bootargs.dyn.root", NULL);
globalvar_set_match("linux.bootargs.dyn.", "");
ret = run_command(bs->scriptpath);
diff --git a/common/startup.c b/common/startup.c
index 749db18e5a..7e5a167af1 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -154,8 +154,6 @@ static const char * const global_autoboot_abort_keys[] = {
static int global_autoboot_timeout = 3;
static char *global_boot_default;
static char *global_linux_bootargs_base;
-static char *global_linux_bootargs_dyn_ip;
-static char *global_linux_bootargs_dyn_root;
static char *global_user;
static bool test_abort(void)
@@ -225,10 +223,6 @@ static int run_init(void)
globalvar_add_simple_string("boot.default", &global_boot_default);
globalvar_add_simple_string("linux.bootargs.base",
&global_linux_bootargs_base);
- globalvar_add_simple_string("linux.bootargs.dyn.ip",
- &global_linux_bootargs_dyn_ip);
- globalvar_add_simple_string("linux.bootargs.dyn.root",
- &global_linux_bootargs_dyn_root);
/* Unblank console cursor */
printf("\e[?25h");
--
2.20.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
