diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /data/NetworkManager.service.in | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'data/NetworkManager.service.in')
| -rw-r--r-- | data/NetworkManager.service.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index 1198c1ba..16b53b68 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -12,7 +12,11 @@ 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 Alias=dbus-org.freedesktop.NetworkManager.service +Also=NetworkManager-wait-online.service + |