aboutsummaryrefslogtreecommitdiff
path: root/tools/env/fw_env_main.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-04-07 10:44:19 -0400
committerTom Rini <trini@konsulko.com>2023-04-07 10:44:19 -0400
commit340bebf9c799793affefd166875d5776744988bd (patch)
tree193a646521cf659f333c5e1c11745116259b0477 /tools/env/fw_env_main.c
parentb0b77fdf3d7d2c1a5e48c3971a677f14e372c164 (diff)
parenta554ee7edee8e10b38c6899ad8556daf58ca3afe (diff)
Merge branch '2023-04-06-assorted-updates'
- Make use of the semi-formal "fallthrough" mechanism, update env tools to use /run for lockfile, add 2048 game (as a way to test console changes), update some CONFIG option logic in Kconfig, have lmb command show regions in use, remove some duplicate serial code, add __gnu_thumb1_case_si code and fix m68k custodian email address.
Diffstat (limited to 'tools/env/fw_env_main.c')
-rw-r--r--tools/env/fw_env_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 1d193bd437..0b201b9e62 100644
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -73,7 +73,7 @@ void usage_printenv(void)
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
" -n, --noheader do not repeat variable name in output\n"
- " -l, --lock lock node, default:/var/lock\n"
+ " -l, --lock lock node, default:/run\n"
"\n");
}
@@ -88,7 +88,7 @@ void usage_env_set(void)
#ifdef CONFIG_FILE
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
- " -l, --lock lock node, default:/var/lock\n"
+ " -l, --lock lock node, default:/run\n"
" -s, --script batch mode to minimize writes\n"
"\n"
"Examples:\n"
@@ -206,7 +206,7 @@ int parse_setenv_args(int argc, char *argv[])
int main(int argc, char *argv[])
{
- char *lockname = "/var/lock/" CMD_PRINTENV ".lock";
+ char *lockname = "/run/" CMD_PRINTENV ".lock";
int lockfd = -1;
int retval = EXIT_SUCCESS;
char *_cmdname;