mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-11 07:24:46 +00:00
cmd/nvedit.c: teach 'env default' to optionally keep runtime variables
It can be useful to set all variables defined in the default environment to the value they have there, but without removing variables that are only defined at runtime. This can sort-of be done today, by using the "env default var1 var2 ..." variant, but that requires listing all variables defined in the default environment. It's much more convenient to be able to say env default -k -a The -k flag is also meaningful in the other case: If var1 is not defined in the default environment, but var2 is, env default var1 var2 would emit a warning about var1 not being in the default env and thus being deleted. With -k, there's no warning, and var1 is kept as-is. Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
This commit is contained in:
parent
84b95e9189
commit
4d28fcdf65
1 changed files with 6 additions and 2 deletions
|
@ -523,6 +523,9 @@ static int do_env_default(struct cmd_tbl *cmdtp, int flag,
|
|||
case 'f': /* force */
|
||||
env_flag |= H_FORCE;
|
||||
break;
|
||||
case 'k':
|
||||
env_flag |= H_NOCLEAR;
|
||||
break;
|
||||
default:
|
||||
return cmd_usage(cmdtp);
|
||||
}
|
||||
|
@ -1133,8 +1136,9 @@ U_BOOT_LONGHELP(env,
|
|||
#if defined(CONFIG_CMD_ENV_CALLBACK)
|
||||
"callbacks - print callbacks and their associated variables\nenv "
|
||||
#endif
|
||||
"default [-f] -a - [forcibly] reset default environment\n"
|
||||
"env default [-f] var [...] - [forcibly] reset variable(s) to their default values\n"
|
||||
"default [-k] [-f] -a - [forcibly] reset default environment\n"
|
||||
"env default [-k] [-f] var [...] - [forcibly] reset variable(s) to their default values\n"
|
||||
" \"-k\": keep variables not defined in default environment\n"
|
||||
"env delete [-f] var [...] - [forcibly] delete variable(s)\n"
|
||||
#if defined(CONFIG_CMD_EDITENV)
|
||||
"env edit name - edit environment variable\n"
|
||||
|
|
Loading…
Add table
Reference in a new issue