From d1865ee2d66a6ea6add07f73f757cbcfeecc32f5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Oct 2020 22:43:13 -0400 Subject: [PATCH] 4 renames: network-manager -> NetworkManager --- roles/network/tasks/NM-debian.yml | 2 +- roles/network/templates/hostapd/clone-wifi.service.j2 | 2 +- roles/network/templates/hostapd/hostapd.service.j2 | 2 +- roles/network/templates/hostapd/wifi-test.service.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml index 7b3a356f5..ece7fa8cd 100644 --- a/roles/network/tasks/NM-debian.yml +++ b/roles/network/tasks/NM-debian.yml @@ -76,6 +76,6 @@ - name: Restart the NetworkManager service systemd: - name: network-manager + name: NetworkManager state: restarted when: not nobridge is defined and not no_net_restart diff --git a/roles/network/templates/hostapd/clone-wifi.service.j2 b/roles/network/templates/hostapd/clone-wifi.service.j2 index 9fc83ddb8..87ae2fa09 100644 --- a/roles/network/templates/hostapd/clone-wifi.service.j2 +++ b/roles/network/templates/hostapd/clone-wifi.service.j2 @@ -5,7 +5,7 @@ After=network-pre.target Before=dhcpcd.service Before=wpa_supplicant.service Before=wpa_supplicant@{{ discovered_wireless_iface }}.service -Before=network-manager.service +Before=NetworkManager.service Before=netplan-wpa@{{ discovered_wireless_iface }}.service Before=hostapd.service diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2 index 3135169eb..30fe57a56 100644 --- a/roles/network/templates/hostapd/hostapd.service.j2 +++ b/roles/network/templates/hostapd/hostapd.service.j2 @@ -6,7 +6,7 @@ After=clone-wifi.service Requires=clone-wifi.service Before=dhcpcd.service Before=wpa_supplicant@{{ discovered_wireless_iface }}.service -Before=network-manager.service +Before=NetworkManager.service Before=netplan-wpa-{{ discovered_wireless_iface }}.service Before=network.target diff --git a/roles/network/templates/hostapd/wifi-test.service.j2 b/roles/network/templates/hostapd/wifi-test.service.j2 index a22f0b42e..90034a3d6 100644 --- a/roles/network/templates/hostapd/wifi-test.service.j2 +++ b/roles/network/templates/hostapd/wifi-test.service.j2 @@ -5,7 +5,7 @@ Wants=wpa_supplicant.service Before=hostapd.service Before=dhcpcd.service Before=wpa_supplicant@{{ discovered_wireless_iface }}.service -Before=network-manager.service +Before=NetworkManager.service Before=netplan-wpa-{{ discovered_wireless_iface }}.service Before=network.target