diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:09:27 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:18:39 +0200 |
| commit | 820498b2158e0b05421ce0922f203a0699927fa8 (patch) | |
| tree | 3bf6d1089b762535ec5e59738d47ae2d2f54750f /data | |
| parent | 1bd9f376796563dfb5016bada66c78b203f41d33 (diff) | |
| parent | 488dda3930545969f5644b57cfca81e21df031c3 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'data')
| -rw-r--r-- | data/85-nm-unmanaged.rules | 3 | ||||
| -rw-r--r-- | data/NetworkManager-dispatcher.service.in | 6 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules index 20f4d29a..edc4ddbe 100644 --- a/data/85-nm-unmanaged.rules +++ b/data/85-nm-unmanaged.rules @@ -26,9 +26,6 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1" # in another net namespace and managed by libvirt, Docker or the like. ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1" -# Docker bridge. Managed by docker daemon. -ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", ENV{NM_UNMANAGED}="1" - # USB gadget device. Unmanage by default, since whatever created it # might want to set it up itself (e.g. activate an ipv4.method=shared # connection). diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in index c450478b..80dc2a1b 100644 --- a/data/NetworkManager-dispatcher.service.in +++ b/data/NetworkManager-dispatcher.service.in @@ -1,6 +1,12 @@ [Unit] Description=Network Manager Script Dispatcher Service +# Order the dispatcher before NetworkManager. While dispatcher +# is D-Bus activate (and not intended to be explicitly wanted by +# another service/target), the ordering dependency matters during +# shutdown. We want first NetworkManager to be stopped. +Before=NetworkManager.service + [Service] Type=dbus BusName=org.freedesktop.nm_dispatcher diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index ff90456f..2f442bf2 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -16,9 +16,6 @@ Restart=on-failure 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 |