New upstream version 1.16.0 upstream/1.16.0

5 files changed, 33 insertions, 33 deletions

diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules
index edc4ddbe..20f4d29a 100644
--- a/data/85-nm-unmanaged.rules
+++ b/data/85-nm-unmanaged.rules
@@ -26,6 +26,9 @@ 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.service.in b/data/NetworkManager.service.in
index 2692935e..ff90456f 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -24,7 +24,6 @@ ProtectHome=read-only
 
 [Install]
 WantedBy=multi-user.target
-Alias=dbus-org.freedesktop.NetworkManager.service
 Also=NetworkManager-dispatcher.service
 
 # We want to enable NetworkManager-wait-online.service whenever this service
diff --git a/data/meson.build b/data/meson.build
index 636db921..f496bf01 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,36 +13,35 @@ configure_file(
   output: server,
   install: true,
   install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
-  configuration: data_conf
+  configuration: data_conf,
 )
 
 if install_systemd_unit_dir
   services = [
-    ['NetworkManager-dispatcher.service', systemd_system_unit_dir],
-    ['NetworkManager.service', systemd_system_unit_dir],
-    ['org.freedesktop.NetworkManager.service', dbus_sys_dir]
+    'NetworkManager-dispatcher.service',
+    'NetworkManager.service',
   ]
 
   if have_systemd_200
-    services += [['NetworkManager-wait-online.service', systemd_system_unit_dir]]
+    services += ['NetworkManager-wait-online.service']
   else
-    services += [['NetworkManager-wait-online-systemd-pre200.service', systemd_system_unit_dir]]
+    services += ['NetworkManager-wait-online-systemd-pre200.service']
   endif
 
   foreach service: services
     configure_file(
-      input: service[0] + '.in',
-      output: service[0],
+      input: service + '.in',
+      output: service,
       install: true,
-      install_dir: service[1],
-      configuration: data_conf
+      install_dir: systemd_system_unit_dir,
+      configuration: data_conf,
     )
   endforeach
 
   if enable_ovs
     install_data(
       'NetworkManager-ovs.conf',
-      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d')
+      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d'),
     )
   endif
 endif
@@ -51,12 +50,12 @@ if install_udev_dir
   data = files(
     '84-nm-drivers.rules',
     '85-nm-unmanaged.rules',
-    '90-nm-thunderbolt.rules'
+    '90-nm-thunderbolt.rules',
   )
 
   install_data(
     data,
-    install_dir: join_paths(udev_dir, 'rules.d')
+    install_dir: join_paths(udev_dir, 'rules.d'),
   )
 endif
 
@@ -66,7 +65,7 @@ if enable_polkit
   policy_in = configure_file(
     input: policy + '.in.in',
     output: policy + '.in',
-    configuration: data_conf
+    configuration: data_conf,
   )
 
   custom_target(
@@ -75,6 +74,6 @@ if enable_polkit
     output: policy,
     command: intltool_xml_cmd,
     install: true,
-    install_dir: polkit_dir
+    install_dir: polkit_dir,
   )
 endif
diff --git a/data/org.freedesktop.NetworkManager.policy.in.in b/data/org.freedesktop.NetworkManager.policy.in.in
index 880bbd57..8b6ea515 100644
--- a/data/org.freedesktop.NetworkManager.policy.in.in
+++ b/data/org.freedesktop.NetworkManager.policy.in.in
@@ -38,8 +38,8 @@
   </action>
 
   <action id="org.freedesktop.NetworkManager.enable-disable-wifi">
-    <_description>Enable or disable WiFi devices</_description>
-    <_message>System policy prevents enabling or disabling WiFi devices</_message>
+    <_description>Enable or disable Wi-Fi devices</_description>
+    <_message>System policy prevents enabling or disabling Wi-Fi devices</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
@@ -74,9 +74,19 @@
     </defaults>
   </action>
 
+  <action id="org.freedesktop.NetworkManager.wifi.scan">
+    <_description>Allow control of Wi-Fi scans</_description>
+    <_message>System policy prevents Wi-Fi scans</_message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
   <action id="org.freedesktop.NetworkManager.wifi.share.protected">
-    <_description>Connection sharing via a protected WiFi network</_description>
-    <_message>System policy prevents sharing connections via a protected WiFi network</_message>
+    <_description>Connection sharing via a protected Wi-Fi network</_description>
+    <_message>System policy prevents sharing connections via a protected Wi-Fi network</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
@@ -84,8 +94,8 @@
   </action>
 
   <action id="org.freedesktop.NetworkManager.wifi.share.open">
-    <_description>Connection sharing via an open WiFi network</_description>
-    <_message>System policy prevents sharing connections via an open WiFi network</_message>
+    <_description>Connection sharing via an open Wi-Fi network</_description>
+    <_message>System policy prevents sharing connections via an open Wi-Fi network</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
diff --git a/data/org.freedesktop.NetworkManager.service.in b/data/org.freedesktop.NetworkManager.service.in
deleted file mode 100644
index 5bd091b4..00000000
--- a/data/org.freedesktop.NetworkManager.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# This D-Bus service activation file is only for systemd support since
-# an auto-activated NetworkManager would be quite surprising for those people
-# who have NM installed but turned off.  Thus the Exec path available to
-# D-Bus is /bin/false, but systemd knows the real Exec path due to the NM
-# systemd .service file.
-
-[D-BUS Service]
-Name=org.freedesktop.NetworkManager
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.freedesktop.NetworkManager.service