diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:14:39 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:14:39 +0100 |
| commit | 90e8691111889a7b5f3c812f5a41f15a8a058913 (patch) | |
| tree | f101a879eca27c34a9bfa5f3da52266b22539a36 /data | |
| parent | bdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 (diff) | |
New upstream version 1.9.90 upstream/1.9.90
Diffstat (limited to 'data')
| -rw-r--r-- | data/NetworkManager-ovs.conf | 2 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 4 | ||||
| -rw-r--r-- | data/org.freedesktop.NetworkManager.policy.in.in | 9 |
4 files changed, 14 insertions, 3 deletions
diff --git a/data/NetworkManager-ovs.conf b/data/NetworkManager-ovs.conf new file mode 100644 index 00000000..dde5ba58 --- /dev/null +++ b/data/NetworkManager-ovs.conf @@ -0,0 +1,2 @@ +[Unit] +After=openvswitch.service diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 1753d203..89632468 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -1,7 +1,7 @@ [Unit] Description=Network Manager Wait Online Documentation=man:nm-online(1) -Requisite=NetworkManager.service +Requires=NetworkManager.service After=NetworkManager.service Before=network-online.target diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index a9e87310..95d58f96 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -8,8 +8,8 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ [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 +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=@sbindir@/NetworkManager --no-daemon Restart=on-failure # NM doesn't want systemd to kill its children for it diff --git a/data/org.freedesktop.NetworkManager.policy.in.in b/data/org.freedesktop.NetworkManager.policy.in.in index 6b42e995..880bbd57 100644 --- a/data/org.freedesktop.NetworkManager.policy.in.in +++ b/data/org.freedesktop.NetworkManager.policy.in.in @@ -151,5 +151,14 @@ </defaults> </action> + <action id="org.freedesktop.NetworkManager.enable-disable-connectivity-check"> + <_description>Enable or disable connectivity checking</_description> + <_message>System policy prevents enabling or disabling connectivity checking</_message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + </policyconfig> |