summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-01-04 11:53:03 -0500
committerDan Winship <danw@gnome.org>2013-01-04 11:53:03 -0500
commit1d89bc0004ec27fbc0c89f17861118c78d7eeab5 (patch)
tree7552822c0384b6914fdab8aec471b6dd0986090d
parente78c3e83d2e0b49641c9d484e0b35b3c6ff9f0db (diff)
downloadNetworkManager-1d89bc0004ec27fbc0c89f17861118c78d7eeab5.tar.gz
systemd: set KillMode=process
By default, when shutting NM down, systemd will kill everything in its cgroup. But this can cause problems (eg, NM thinking that dhclient crashed and then taking down an interface that it would otherwise have left up). Fix this by setting KillMode=process, which tells systemd to only kill NM itself, and let NM kill its children. https://bugzilla.redhat.com/show_bug.cgi?id=876218
-rw-r--r--data/NetworkManager.service.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 9a5f1258b8..16b53b68f3 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -12,6 +12,8 @@ ExecStart=@sbindir@/NetworkManager --no-daemon
# with LOG_PERROR when run in foreground. But systemd redirects stderr to
# syslog by default, which results in logging each message twice.
StandardError=null
+# NM doesn't want systemd to kill its children for it
+KillMode=process
[Install]
WantedBy=multi-user.target