package/boot/uboot-envtools/patches/002-Revert-tools-env-use-run-to-store-lockfile.patch

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