002-Revert-tools-env-use-run-to-store-lockfile.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. Revert "tools: env: use /run to store lockfile"
  2. In OpenWRT we still use /var/lock as default location for lock files and
  3. /run might not even exist. Revert the upstream change and restore the
  4. previous default path.
  5. This reverts upstream commit
  6. https://source.denx.de/u-boot/u-boot/-/commit/aeb40f1166e072856f865d26d42a4bea1ec3a514
  7. ---
  8. tools/env/fw_env_main.c | 6 +++---
  9. 1 file changed, 3 insertions(+), 3 deletions(-)
  10. --- a/tools/env/fw_env_main.c
  11. +++ b/tools/env/fw_env_main.c
  12. @@ -73,7 +73,7 @@ void usage_printenv(void)
  13. " -c, --config configuration file, default:" CONFIG_FILE "\n"
  14. #endif
  15. " -n, --noheader do not repeat variable name in output\n"
  16. - " -l, --lock lock node, default:/run\n"
  17. + " -l, --lock lock node, default:/var/lock\n"
  18. "\n");
  19. }
  20. @@ -88,7 +88,7 @@ void usage_env_set(void)
  21. #ifdef CONFIG_FILE
  22. " -c, --config configuration file, default:" CONFIG_FILE "\n"
  23. #endif
  24. - " -l, --lock lock node, default:/run\n"
  25. + " -l, --lock lock node, default:/var/lock\n"
  26. " -s, --script batch mode to minimize writes\n"
  27. "\n"
  28. "Examples:\n"
  29. @@ -206,7 +206,7 @@ int parse_setenv_args(int argc, char *ar
  30. int main(int argc, char *argv[])
  31. {
  32. - char *lockname = "/run/" CMD_PRINTENV ".lock";
  33. + char *lockname = "/var/lock/" CMD_PRINTENV ".lock";
  34. int lockfd = -1;
  35. int retval = EXIT_SUCCESS;
  36. char *_cmdname;