package/nginx: use /run for PIDFile

Fixes:

systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references a path below legacy directory /var/run/, updating /var/run/nginx.pid ? /run/nginx.pid; please update the unit file accordingly.

---
 package/nginx/nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 320df9a80e..9fd215fd3e 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nginx.pid
+PIDFile=/run/nginx.pid
 ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
 ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'

2.25.1

Hello,

Thanks for this. Does this means we also need to fix:

$ git grep PIDFile=/var *
package/bandwidthd/bandwidthd.service:PIDFile=/var/run/bandwidthd.pid
package/dhcpcd/dhcpcd.service:PIDFile=/var/run/dhcpcd.pid
package/htpdate/htpdate.service:PIDFile=/var/run/htpdate
package/minidlna/minidlnad.service:PIDFile=/var/run/minidlna/minidlna.pid
package/nginx/nginx.service:PIDFile=/var/run/nginx.pid
package/nss-pam-ldapd/nslcd.service:PIDFile=/var/run/nslcd/nslcd.pid
package/openvmtools/vmtoolsd.service:PIDFile=/var/run/vmtoolsd.pid
package/postgresql/postgresql.service:PIDFile=/var/lib/pgsql/postmaster.pid

Best regards,

Thomas

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Hi,

i don't use any of those packages. So i didn't get warnings for them. But it would make sense.
I ran into the issue that systemd removed /var/lock entirely with the version in BR 2020.08. So this might happen to /var/run in the future as well.

Should I throw this together into one single patch?

Regards,
Michael

Fixes:

systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references a path below legacy directory /var/run/, updating /var/run/nginx.pid ? /run/nginx.pid; please update the unit file accordingly.

Details:
- https://github.com/systemd/systemd/pull/10712

---
 package/bandwidthd/bandwidthd.service | 2 +-
 package/dhcpcd/dhcpcd.service         | 2 +-
 package/htpdate/htpdate.service       | 2 +-
 package/minidlna/minidlnad.service    | 2 +-
 package/nginx/nginx.service           | 2 +-
 package/nss-pam-ldapd/nslcd.service   | 2 +-
 package/openvmtools/vmtoolsd.service  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

index 9c03d42946..ab7f05a2e8 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/bandwidthd
-PIDFile=/var/run/bandwidthd.pid
+PIDFile=/run/bandwidthd.pid
 
 [Install]
 WantedBy=multi-user.target

index 0552b5c73a..e648092c9b 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=-/etc/default/dhcpcd
-PIDFile=/var/run/dhcpcd.pid
+PIDFile=/run/dhcpcd.pid
 ExecStart=/sbin/dhcpcd $DAEMON_ARGS
 Restart=always
 

index 0c77550813..aedb73eb93 100644
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/htpdate
+PIDFile=/run/htpdate
 Environment=HTPDATE_ARGS="-a -s -t https://www.google.com"
 EnvironmentFile=-/etc/default/htpdate
 ExecStart=/usr/bin/htpdate -D -i /var/run/htpdate $HTPDATE_ARGS

index f69476b303..4e968d3858 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/minidlnad
-PIDFile=/var/run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target

index 320df9a80e..9fd215fd3e 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nginx.pid
+PIDFile=/run/nginx.pid
 ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
 ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'

index 6c0d71b241..5a000a8e4c 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
+PIDFile=/run/nslcd/nslcd.pid
 ExecStart=/usr/sbin/nslcd
 
 [Install]

index cb97357ec2..12e28f5923 100644
@@ -5,7 +5,7 @@ ConditionVirtualization=vmware
 
 [Service]
 Type=forking
-PIDFile=/var/run/vmtoolsd.pid
+PIDFile=/run/vmtoolsd.pid
 ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
 Restart=on-failure
 KillMode=process

2.25.1

Hello,

I think we would normally prefer one patch for each. For example, for htpdate, we also need to fix the PIDFile path so that it has a .pid extension.

Also, is there something that needs to be done with Postgresql:

package/postgresql/postgresql.service:PIDFile=/var/lib/pgsql/postmaster.pid

is it expected to have the PIDFile in /var/lib ?

Thomas

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Hi,

okay, i'll split that up.

I'm not sure where the initial .service file came from. The postgres manual doesn't use PIDFile as it has a Type=notify configuration [0]. Debian uses a forking config for it's clustered setup [1], maybe it was derived from there.

The unit was changed to notify in [2] and I think this commit should have also removed the PIDFile.

(for the initial topic this isn't an issue because /var/lib is still a valid folder, but while we're at it...)

[0] https://www.postgresql.org/docs/12/server-start.html
[1]
https://salsa.debian.org/postgresql/postgresql-common/-/blob/master/systemd/postgresql at .service
[2]
https://git.busybox.net/buildroot/commit/package/postgresql/postgresql.service?id=eada187e77022f0da30884a826dc1767ba99abe8

Regards,
Michael

Only systemd .services of Type=notify need a PIDFile entry. [0] This pidfile should be located in /run. [0]
/var/run is deprecated and systemd warns about it on every bootup. [1] This series fixes all affected packages.

Details:
[0] https://www.freedesktop.org/software/systemd/man/systemd.service.html#PIDFile=
[1] https://github.com/systemd/systemd/pull/10712

Michael Nosthoff (8):
package/nginx: use /run for PIDFile package/bandwithd: use /run for PIDFile package/dhcpcd: use /run for PIDFile package/htpdate: use /run for PIDFile package/minidlna: use /run for PIDFile package/nss-pam-ldapd: use /run for PIDFile package/openvmtools: use /run for PIDFile package/postgresql: remove PIDFile from .service

 package/bandwidthd/bandwidthd.service | 2 +-
 package/dhcpcd/dhcpcd.service         | 2 +-
 package/htpdate/htpdate.service       | 4 ++--
 package/minidlna/minidlnad.service    | 2 +-
 package/nginx/nginx.service           | 2 +-
 package/nss-pam-ldapd/nslcd.service   | 2 +-
 package/openvmtools/vmtoolsd.service  | 4 ++--
 package/postgresql/postgresql.service | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)

2.25.1

On 16.09.2020 13:45, Michael Nosthoff via buildroot wrote:

I messed up the in-reply-to. I'll resend have this clean in patchwork.

Fixes:

systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references a path below legacy directory /var/run/, updating /var/run/nginx.pid ? /run/nginx.pid; please update the unit file accordingly.

---
 package/nginx/nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 320df9a80e..9fd215fd3e 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nginx.pid
+PIDFile=/run/nginx.pid
 ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
 ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/bandwithd.pid ? /run/bandwithd.pid; please update the unit file accordingly.

---
 package/bandwidthd/bandwidthd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9c03d42946..ab7f05a2e8 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/bandwidthd
-PIDFile=/var/run/bandwidthd.pid
+PIDFile=/run/bandwidthd.pid
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/dhcpcd.pid ? /run/dhcpcd.pid; please update the unit file accordingly.

---
 package/dhcpcd/dhcpcd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 0552b5c73a..e648092c9b 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=-/etc/default/dhcpcd
-PIDFile=/var/run/dhcpcd.pid
+PIDFile=/run/dhcpcd.pid
 ExecStart=/sbin/dhcpcd $DAEMON_ARGS
 Restart=always
 

2.25.1

- rename pidfile from htpdate to htpdate.pid

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/htpdate.pid ? /run/htpdate.pid; please update the unit file accordingly.

---
 package/htpdate/htpdate.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 0c77550813..b7f1371b08 100644
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/htpdate
+PIDFile=/run/htpdate.pid
 Environment=HTPDATE_ARGS="-a -s -t https://www.google.com"
 EnvironmentFile=-/etc/default/htpdate
-ExecStart=/usr/bin/htpdate -D -i /var/run/htpdate $HTPDATE_ARGS
+ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/minidlna.pid ? /run/minidlna.pid; please update the unit file accordingly.

---
 package/minidlna/minidlnad.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index f69476b303..4e968d3858 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/minidlnad
-PIDFile=/var/run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/nslcd.pid ? /run/nslcd.pid; please update the unit file accordingly.

---
 package/nss-pam-ldapd/nslcd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 6c0d71b241..5a000a8e4c 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
+PIDFile=/run/nslcd/nslcd.pid
 ExecStart=/usr/sbin/nslcd
 
 [Install]

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/vmtoolsd.pid ? /run/vmtoolsd.pid; please update the unit file accordingly.

---
 package/openvmtools/vmtoolsd.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index cb97357ec2..1d2a3566cf 100644
@@ -5,8 +5,8 @@ ConditionVirtualization=vmware
 
 [Service]
 Type=forking
-PIDFile=/var/run/vmtoolsd.pid
-ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
+PIDFile=/run/vmtoolsd.pid
+ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid
 Restart=on-failure
 KillMode=process
 KillSignal=SIGKILL

2.25.1

commit eada187e77022f0d changed the service to Type=notify. notify units don't need a PIDFile so this can be removed.

---
 package/postgresql/postgresql.service | 1 -
 1 file changed, 1 deletion(-)

index 53e6f84f00..539eea8964 100644
@@ -15,7 +15,6 @@ Group=postgres
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=postgres
-PIDFile=/var/lib/pgsql/postmaster.pid
 
 ExecStartPre=/bin/sh -c "if [ ! -f /var/lib/pgsql/PG_VERSION ]; then /usr/bin/pg_ctl initdb -D /var/lib/pgsql; fi"
 ExecStart=/usr/bin/postgres -D /var/lib/pgsql

2.25.1

Only systemd .services of Type=notify need a PIDFile entry. [0] This pidfile should be located in /run. [0]
/var/run is deprecated and systemd warns about it on every bootup. [1] This series fixes all affected packages.

Details:
[0] https://www.freedesktop.org/software/systemd/man/systemd.service.html#PIDFile=
[1] https://github.com/systemd/systemd/pull/10712

Michael Nosthoff (8):
package/nginx: use /run for PIDFile package/bandwithd: use /run for PIDFile package/dhcpcd: use /run for PIDFile package/htpdate: use /run for PIDFile package/minidlna: use /run for PIDFile package/nss-pam-ldapd: use /run for PIDFile package/openvmtools: use /run for PIDFile package/postgresql: remove PIDFile from .service

 package/bandwidthd/bandwidthd.service | 2 +-
 package/dhcpcd/dhcpcd.service         | 2 +-
 package/htpdate/htpdate.service       | 4 ++--
 package/minidlna/minidlnad.service    | 2 +-
 package/nginx/nginx.service           | 2 +-
 package/nss-pam-ldapd/nslcd.service   | 2 +-
 package/openvmtools/vmtoolsd.service  | 4 ++--
 package/postgresql/postgresql.service | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)

2.25.1

Fixes:

systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references a path below legacy directory /var/run/, updating /var/run/nginx.pid ? /run/nginx.pid; please update the unit file accordingly.

---
 package/nginx/nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 320df9a80e..9fd215fd3e 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nginx.pid
+PIDFile=/run/nginx.pid
 ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx
 ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;'
 ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;'

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/bandwithd.pid ? /run/bandwithd.pid; please update the unit file accordingly.

---
 package/bandwidthd/bandwidthd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9c03d42946..ab7f05a2e8 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/bandwidthd
-PIDFile=/var/run/bandwidthd.pid
+PIDFile=/run/bandwidthd.pid
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/dhcpcd.pid ? /run/dhcpcd.pid; please update the unit file accordingly.

---
 package/dhcpcd/dhcpcd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 0552b5c73a..e648092c9b 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=-/etc/default/dhcpcd
-PIDFile=/var/run/dhcpcd.pid
+PIDFile=/run/dhcpcd.pid
 ExecStart=/sbin/dhcpcd $DAEMON_ARGS
 Restart=always
 

2.25.1

- rename pidfile from htpdate to htpdate.pid

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/htpdate.pid ? /run/htpdate.pid; please update the unit file accordingly.

---
 package/htpdate/htpdate.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 0c77550813..b7f1371b08 100644
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/htpdate
+PIDFile=/run/htpdate.pid
 Environment=HTPDATE_ARGS="-a -s -t https://www.google.com"
 EnvironmentFile=-/etc/default/htpdate
-ExecStart=/usr/bin/htpdate -D -i /var/run/htpdate $HTPDATE_ARGS
+ExecStart=/usr/bin/htpdate -D -i /run/htpdate.pid $HTPDATE_ARGS
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/minidlna.pid ? /run/minidlna.pid; please update the unit file accordingly.

---
 package/minidlna/minidlnad.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index f69476b303..4e968d3858 100644
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/minidlnad
-PIDFile=/var/run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/nslcd.pid ? /run/nslcd.pid; please update the unit file accordingly.

---
 package/nss-pam-ldapd/nslcd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 6c0d71b241..5a000a8e4c 100644
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nslcd/nslcd.pid
+PIDFile=/run/nslcd/nslcd.pid
 ExecStart=/usr/sbin/nslcd
 
 [Install]

2.25.1

Fixes:

PIDFile= references a path below legacy directory /var/run/, updating /var/run/vmtoolsd.pid ? /run/vmtoolsd.pid; please update the unit file accordingly.

---
 package/openvmtools/vmtoolsd.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index cb97357ec2..1d2a3566cf 100644
@@ -5,8 +5,8 @@ ConditionVirtualization=vmware
 
 [Service]
 Type=forking
-PIDFile=/var/run/vmtoolsd.pid
-ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
+PIDFile=/run/vmtoolsd.pid
+ExecStart=/usr/bin/vmtoolsd -b /run/vmtoolsd.pid
 Restart=on-failure
 KillMode=process
 KillSignal=SIGKILL

2.25.1

commit eada187e77022f0d changed the service to Type=notify. notify units don't need a PIDFile so this can be removed.

---
 package/postgresql/postgresql.service | 1 -
 1 file changed, 1 deletion(-)

index 53e6f84f00..539eea8964 100644
@@ -15,7 +15,6 @@ Group=postgres
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=postgres
-PIDFile=/var/lib/pgsql/postmaster.pid
 
 ExecStartPre=/bin/sh -c "if [ ! -f /var/lib/pgsql/PG_VERSION ]; then /usr/bin/pg_ctl initdb -D /var/lib/pgsql; fi"
 ExecStart=/usr/bin/postgres -D /var/lib/pgsql

2.25.1

Thanks, series applied.

Thomas

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Series (except for the htpdate one) committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.

Bye, Peter Korsgaard