diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/90-nm-thunderbolt.rules | 13 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 5 | ||||
| -rw-r--r-- | data/meson.build | 80 |
3 files changed, 0 insertions, 98 deletions
diff --git a/data/90-nm-thunderbolt.rules b/data/90-nm-thunderbolt.rules deleted file mode 100644 index 52d8bb41..00000000 --- a/data/90-nm-thunderbolt.rules +++ /dev/null @@ -1,13 +0,0 @@ -# Do not modify this file, it will get overwritten on updates. -# To override or extend the rules place a file in /etc/udev/rules.d - -ACTION!="add", GOTO="nm_thunderbolt_end" - -# Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain -# is added. -SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="kmod load thunderbolt-net" - -# For all thunderbolt network devices, we want to enable link-local configuration -SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="thunderbolt-net", ENV{NM_AUTO_DEFAULT_LINK_LOCAL_ONLY}="1" - -LABEL="nm_thunderbolt_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index 2692935e..95d58f96 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -27,8 +27,3 @@ 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 -# is enabled. NetworkManager-wait-online.service has -# WantedBy=network-online.target, so enabling it only has an effect if -# network-online.target itself is enabled or pulled in by some other unit. -Also=NetworkManager-wait-online.service diff --git a/data/meson.build b/data/meson.build deleted file mode 100644 index 636db921..00000000 --- a/data/meson.build +++ /dev/null @@ -1,80 +0,0 @@ -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, - install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'), - 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] - ] - - if have_systemd_200 - services += [['NetworkManager-wait-online.service', systemd_system_unit_dir]] - else - services += [['NetworkManager-wait-online-systemd-pre200.service', systemd_system_unit_dir]] - endif - - foreach service: services - configure_file( - input: service[0] + '.in', - output: service[0], - install: true, - install_dir: service[1], - configuration: data_conf - ) - endforeach - - if enable_ovs - install_data( - 'NetworkManager-ovs.conf', - install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d') - ) - endif -endif - -if install_udev_dir - data = files( - '84-nm-drivers.rules', - '85-nm-unmanaged.rules', - '90-nm-thunderbolt.rules' - ) - - install_data( - data, - install_dir: join_paths(udev_dir, 'rules.d') - ) -endif - -if enable_polkit - policy = 'org.freedesktop.NetworkManager.policy' - - policy_in = configure_file( - input: policy + '.in.in', - output: policy + '.in', - configuration: data_conf - ) - - custom_target( - policy, - input: policy_in, - output: policy, - command: intltool_xml_cmd, - install: true, - install_dir: polkit_dir - ) -endif |