From 90e8691111889a7b5f3c812f5a41f15a8a058913 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 7 Nov 2017 00:14:39 +0100
Subject: New upstream version 1.9.90

---
 data/NetworkManager-ovs.conf                     | 2 ++
 data/NetworkManager-wait-online.service.in       | 2 +-
 data/NetworkManager.service.in                   | 4 ++--
 data/org.freedesktop.NetworkManager.policy.in.in | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 data/NetworkManager-ovs.conf

(limited to 'data')

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>
 
-- 
cgit 1.3.0-6-gf8a5