diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-05-14 23:05:26 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-05-14 23:27:31 +0200 |
| commit | 397555d17943664e92696c963e54ad71af508ab5 (patch) | |
| tree | a6cc75902c74d4cfb96dac3e48a2f8bca634374e | |
| parent | cd49b6ce4fe0be733b1db92787aeafc713a969ad (diff) | |
| download | ptxdist-397555d17943664e92696c963e54ad71af508ab5.tar.gz ptxdist-397555d17943664e92696c963e54ad71af508ab5.tar.xz | |
networkmanager: sync systemd services with upstream
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | generic/lib/systemd/system/NetworkManager.service | 8 | ||||
| -rw-r--r-- | rules/networkmanager.make | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/generic/lib/systemd/system/NetworkManager.service b/generic/lib/systemd/system/NetworkManager.service index be03e4d46..f41c8b4bc 100644 --- a/generic/lib/systemd/system/NetworkManager.service +++ b/generic/lib/systemd/system/NetworkManager.service @@ -8,7 +8,15 @@ Before=network.target Type=dbus BusName=org.freedesktop.NetworkManager ExecStart=/usr/sbin/NetworkManager --no-daemon --config=/var/run/NetworkManager.conf --state-file=/var/run/NetworkManager.state +# 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 [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service +Also=NetworkManager-wait-online.service + diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 3a7835696..8bcfdcc60 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -132,6 +132,8 @@ ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT /lib/systemd/system/NetworkManager-unmanage.service) @$(call install_link, networkmanager, ../NetworkManager-unmanage.service, \ /lib/systemd/system/NetworkManager.service.wants/NetworkManager-unmanage.service) + @$(call install_alternative, networkmanager, 0, 0, 0644, \ + /lib/systemd/system/NetworkManager-wait-online.service) endif @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/sbin/NetworkManager) |