about summary refs log tree commit diff
path: root/data/NetworkManager.service.in
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-07-06 03:04:17 +0200
committerMichael Biebl <biebl@debian.org>2014-07-06 03:04:17 +0200
commit3ce667b6ee6b86291bbe60ef93cba7f11a5c5400 (patch)
treeaf3daa7221e898b72f3de26eb2cf0c1b1c8661b0 /data/NetworkManager.service.in
parentf02d31d95af29678092d1ff01f714621bc9dcc0f (diff)
parent33491bc4279481db8ae47213e34a6d695a0e8830 (diff)
Merge tag 'upstream/0.9.10.0'
Upstream version 0.9.10.0
Diffstat (limited to 'data/NetworkManager.service.in')
-rw-r--r--data/NetworkManager.service.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index ddc16275..84a9c959 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -1,16 +1,12 @@
 [Unit]
 Description=Network Manager
 Wants=network.target
-Before=network.target
+Before=network.target @DISTRO_NETWORK_SERVICE@
 
 [Service]
 Type=dbus
 BusName=org.freedesktop.NetworkManager
 ExecStart=@sbindir@/NetworkManager --no-daemon
-# Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog()
-# 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