diff options
author | Tim Lee <timlee660101@gmail.com> | 2023-02-10 17:05:39 +0800 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-04-06 19:10:05 -0400 |
commit | aeb40f1166e072856f865d26d42a4bea1ec3a514 (patch) | |
tree | 6115c834bdd57715945ad82ef956c0be5064d9af /tools/env | |
parent | c9eb37a1e764b43d2cd2a4a5e6f07d247c569ab7 (diff) | |
download | u-boot-aeb40f1166e072856f865d26d42a4bea1ec3a514.zip u-boot-aeb40f1166e072856f865d26d42a4bea1ec3a514.tar.gz u-boot-aeb40f1166e072856f865d26d42a4bea1ec3a514.tar.bz2 |
tools: env: use /run to store lockfile
According this issue https://github.com/ppp-project/ppp/issues/339.
Eventually, the dt-utils changed lock directory to fix missing /var/lock
directory error then make dt-utils can run normally.
We also have a similar issue with these two utilities fw_printenv and
fw_setenv will failed when the directory /var/lock is non-existent.
We have a custom linux distribution built with yocto (OpenBMC) that
use systemd and it deprecated the /var/lock directory.
More discussion in systemd/systemd#15668.
Thus, we sync with community's solution for uboot/tools/env utilities:
The current location /var/lock is considered legacy (at least by systemd).
Just use /run to store the lockfile and append the usual .lock suffix.
Tested:
Verified /run/lock is now present and fw_printenv can work in OpenBMC.
Signed-off-by: Tim Lee <timlee660101@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools/env')
-rw-r--r-- | tools/env/fw_env_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 1d193bd..0b201b9 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; |