Skip to contentSkip to conversation

tools: env: use /run to store lockfile

PATCH In review Tim Lee 3 participants 5 messages Feb 10, 2023 – Apr 7, 2023

lore
Share & tools
lore

Tim Lee

author
#0 lore raw

PATCH 1/1 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.

---
 tools/env/fw_env_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/env/fw_env_main.c +3 -3
index 1d193bd437..0b201b9e62 100644
@@ -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;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Tim Lee

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.

Quoted 8 lines

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.

Signature · 1 line
Tom
Reviewed-by Tom Rini
#2 lore raw

Hi Tom,

Is this commit valuable to merge into u-boot upstream? Thanks your reviewing, just ping this event friendly.

Best regards,
Tim

-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Friday, February 10, 2023 11:30 PM
To: Tim Lee <[email protected]>
Cc: [email protected]; CS20 CHLi30 <[email protected]>; [email protected]
Subject: Re: [PATCH v1 1/1] tools: env: use /run to store lockfile

Quoted 11 lines · Tim Lee

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.

Quoted 8 lines

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.

--
Tom
________________________________
________________________________
The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.

#3 lore raw
Quoted 4 lines · On Thu, Feb 23, 2023 at 01:06:20AM +0000, [email protected] wrote:

Hi Tom,

Is this commit valuable to merge into u-boot upstream? Thanks your reviewing, just ping this event friendly.

Yes, I'll be putting this in next soon, thanks.

Quoted 40 lines

Best regards,
Tim

-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Friday, February 10, 2023 11:30 PM
To: Tim Lee <[email protected]>
Cc: [email protected]; CS20 CHLi30 <[email protected]>; [email protected]
Subject: Re: [PATCH v1 1/1] tools: env: use /run to store lockfile

Quoted 11 lines · Tim Lee

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.

Quoted 8 lines

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.

--
Tom
________________________________
________________________________
The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.

Signature · 1 line
Tom
#4 lore raw
In reply to Tim Lee
Quoted 15 lines · Tim Lee

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.

Quoted 6 lines

Tested:
Verified /run/lock is now present and fw_printenv can work in OpenBMC.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom