colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp/dhcpcd: fix location of PID file for dhcpcd

Browse Source 
"RUNDIR" is set to "$runstatedir/NetworkManager". That is not correct,
we must use "$runstatedir".

I don't understand how this could have ever worked. Commit e2ecf5b808
('dhcp: dhcpcd uses a fixed path for PID files') seems to address this issue,
but already then "RUNDIR" was set to "$(localstatedir)/run/NetworkManager".
This commit is contained in:
Thomas Haller
2019-05-14 10:00:25 +02:00
parent 2edf18376f
commit 5c3f5a846e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dhcp/nm-dhcp-dhcpcd.c
View File

@@ -100,9 +100,9 @@ ip4_start (NMDhcpClient *client,
iface = nm_dhcp_client_get_iface (client);
/* dhcpcd does not allow custom pidfiles; the pidfile is always
* RUNDIR "dhcpcd-<ifname>.pid".
* RUNSTATEDIR "dhcpcd-<ifname>.pid".
*/
priv->pid_file = g_strdup_printf (RUNDIR "/dhcpcd-%s.pid", iface);
priv->pid_file = g_strdup_printf (RUNSTATEDIR "/dhcpcd-%s.pid", iface);
dhcpcd_path = nm_dhcp_dhcpcd_get_path ();
if (!dhcpcd_path) {