diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-10-29 15:12:32 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-30 10:16:46 +0100 |
| commit | 3992dfb1c4f868806be31b41af69c748ddecd68d (patch) | |
| tree | 09e4bc8ab43bec84b0dfdb9e3caf6d7f4d554b24 | |
| parent | b9053081c086b8b634a1e148ffd27d5d9ef722e5 (diff) | |
| download | NetworkManager-3992dfb1c4f868806be31b41af69c748ddecd68d.tar.gz | |
Move NM's spawns pid files to /run/sendsigs.omit.d.
The pidfiles are only used by NM to start and be able to stop the same process,
their actual location doesn't overly matter. In this case, putting them
under /run/sendsigs.omit.d allows shutdown to skip over those as handled by
an upstart job, and in fact they are (although indirectly).
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-dhclient.c | 2 | ||||
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 91515ddac1..28602d7c28 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -331,7 +331,7 @@ dhclient_start (NMDhcpClient *client, return FALSE; } - pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid", + pid_file = g_strdup_printf ("/run/sendsigs.omit.d/network-manager.dhclient%s-%s.pid", ipv6 ? "6" : "", iface); diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index f26ccfaa3f..fbc8295b28 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -42,7 +42,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN) #define NM_DNS_DNSMASQ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqPrivate)) -#define PIDFILE NMRUNDIR "/dnsmasq.pid" +#define PIDFILE "/run/sendsigs.omit.d/network-manager.dnsmasq.pid" #define CONFFILE NMRUNDIR "/dnsmasq.conf" #define CONFDIR NMCONFDIR "/dnsmasq.d" |