From 5c3f5a846e89912a44ac744dffd4c70a2225ac39 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 14 May 2019 10:00:25 +0200 Subject: [PATCH] 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". --- src/dhcp/nm-dhcp-dhcpcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c index 2a7482b1f..ddfb3a413 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-.pid". + * RUNSTATEDIR "dhcpcd-.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) {