New upstream version 1.22.0 upstream/1.22.0

2 files changed, 17 insertions, 29 deletions

diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 2f442bf2..91ebd9a3 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -8,7 +8,7 @@ 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=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
 #ExecReload=/bin/kill -HUP $MAINPID
 ExecStart=@sbindir@/NetworkManager --no-daemon
 Restart=on-failure
diff --git a/data/meson.build b/data/meson.build
index f496bf01..b572d27d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,39 +1,27 @@
-data_conf = configuration_data()
-data_conf.set('bindir', nm_bindir)
-data_conf.set('libexecdir', nm_libexecdir)
-data_conf.set('sbindir', nm_sbindir)
-data_conf.set('sysconfdir', nm_sysconfdir)
-data_conf.set('DISTRO_NETWORK_SERVICE', (enable_ifcfg_rh ? 'network.service' : ''))
-data_conf.set('NM_MODIFY_SYSTEM_POLICY', (enable_modify_system ? 'yes' : 'auth_admin_keep'))
-
-server = 'server.conf'
-
 configure_file(
-  input: server + '.in',
-  output: server,
-  install: true,
+  input: 'server.conf.in',
+  output: '@BASENAME@',
   install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
   configuration: data_conf,
 )
 
-if install_systemd_unit_dir
+if install_systemdunitdir
   services = [
-    'NetworkManager-dispatcher.service',
-    'NetworkManager.service',
+    'NetworkManager-dispatcher.service.in',
+    'NetworkManager.service.in',
   ]
 
   if have_systemd_200
-    services += ['NetworkManager-wait-online.service']
+    services += ['NetworkManager-wait-online.service.in']
   else
-    services += ['NetworkManager-wait-online-systemd-pre200.service']
+    services += ['NetworkManager-wait-online-systemd-pre200.service.in']
   endif
 
   foreach service: services
     configure_file(
-      input: service + '.in',
-      output: service,
-      install: true,
-      install_dir: systemd_system_unit_dir,
+      input: service,
+      output: '@BASENAME@',
+      install_dir: systemd_systemdsystemunitdir,
       configuration: data_conf,
     )
   endforeach
@@ -41,12 +29,12 @@ if install_systemd_unit_dir
   if enable_ovs
     install_data(
       'NetworkManager-ovs.conf',
-      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d'),
+      install_dir: join_paths(systemd_systemdsystemunitdir, 'NetworkManager.service.d'),
     )
   endif
 endif
 
-if install_udev_dir
+if install_udevdir
   data = files(
     '84-nm-drivers.rules',
     '85-nm-unmanaged.rules',
@@ -55,7 +43,7 @@ if install_udev_dir
 
   install_data(
     data,
-    install_dir: join_paths(udev_dir, 'rules.d'),
+    install_dir: join_paths(udev_udevdir, 'rules.d'),
   )
 endif
 
@@ -64,16 +52,16 @@ if enable_polkit
 
   policy_in = configure_file(
     input: policy + '.in.in',
-    output: policy + '.in',
+    output: '@BASENAME@',
     configuration: data_conf,
   )
 
   custom_target(
     policy,
     input: policy_in,
-    output: policy,
+    output: '@BASENAME@',
     command: intltool_xml_cmd,
     install: true,
-    install_dir: polkit_dir,
+    install_dir: polkit_gobject_policydir,
   )
 endif