diff options
author | Thomas Haller <thaller@redhat.com> | 2019-05-14 10:00:25 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-05-17 21:24:18 +0200 |
commit | 5c3f5a846e89912a44ac744dffd4c70a2225ac39 (patch) | |
tree | 33d1aa1c747a12dbd7b286f06ce273d2a25b76e4 | |
parent | 2edf18376f8fcd5a664717f360c910fa36606678 (diff) | |
download | NetworkManager-5c3f5a846e89912a44ac744dffd4c70a2225ac39.tar.gz |
dhcp/dhcpcd: fix location of PID file for dhcpcd
"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 e2ecf5b808c5
('dhcp: dhcpcd uses a fixed path for PID files') seems to address this issue,
but already then "RUNDIR" was set to "$(localstatedir)/run/NetworkManager".
-rw-r--r-- | src/dhcp/nm-dhcp-dhcpcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c index 2a7482b1fe..ddfb3a4135 100644 --- a/src/dhcp/nm-dhcp-dhcpcd.c +++ b/src/dhcp/nm-dhcp-dhcpcd.c @@ -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) { |