diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-02 15:21:02 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-02 15:23:02 +0100 |
| commit | ee6682b2d283972f3ebb132aec92b8d5d6ef1082 (patch) | |
| tree | 18cdcc18925e2ac198511f4220de0175c2ac8adc /projectroot | |
| parent | 5d802171589f8a73cc41a6a2f62c6b0109eaaf94 (diff) | |
| download | ptxdist-ee6682b2d283972f3ebb132aec92b8d5d6ef1082.tar.gz ptxdist-ee6682b2d283972f3ebb132aec92b8d5d6ef1082.tar.xz | |
networkmanager: sync systemd service file with latest upstream version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rw-r--r-- | projectroot/usr/lib/systemd/system/NetworkManager.service | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/projectroot/usr/lib/systemd/system/NetworkManager.service b/projectroot/usr/lib/systemd/system/NetworkManager.service index f41c8b4bc..7c56d8e24 100644 --- a/projectroot/usr/lib/systemd/system/NetworkManager.service +++ b/projectroot/usr/lib/systemd/system/NetworkManager.service @@ -1,22 +1,29 @@ [Unit] Description=Network Manager -After=syslog.target +Documentation=man:NetworkManager(8) Wants=network.target +After=network-pre.target dbus.service Before=network.target [Service] Type=dbus BusName=org.freedesktop.NetworkManager +#ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 +ExecReload=/bin/kill -HUP $MAINPID 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 +Restart=on-failure # NM doesn't want systemd to kill its children for it KillMode=process +CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT + +# ibft settings plugin calls iscsiadm which needs CAP_SYS_ADMIN +#CapabilityBoundingSet=CAP_SYS_ADMIN + +ProtectSystem=true +ProtectHome=read-only [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service -Also=NetworkManager-wait-online.service +Also=NetworkManager-dispatcher.service |