Merge pull request #2599 from holta/NetworkManager-name

4 renames: network-manager -> NetworkManager for Ubuntu 20.10

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

roles/network/tasks/hostapd.yml

@@ -93,7 +93,7 @@
     state: absent
   when: is_raspbian and not wifi_up_down
 
-- name: Create networkd-dispatcher diagnosic hook for recording network events
+- name: Create networkd-dispatcher diagnostic hook for recording network events
   template:
     owner: root
     group: root

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
 

roles/network/templates/hostapd/hostapd.service.j2

@@ -5,9 +5,9 @@ After=network-pre.target
 After=clone-wifi.service
 Requires=clone-wifi.service
 Before=dhcpcd.service
-Before=wpa_supplicant@{{ discovered_wireless_iface  }}.service
-Before=network-manager.service
-Before=netplan-wpa-{{ discovered_wireless_iface  }}.service
+Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
+Before=NetworkManager.service
+Before=netplan-wpa-{{ discovered_wireless_iface }}.service
 Before=network.target
 
 [Service]

roles/network/templates/hostapd/wifi-test.service.j2

@@ -4,9 +4,9 @@ After=wpa_supplicant.service
 Wants=wpa_supplicant.service
 Before=hostapd.service
 Before=dhcpcd.service
-Before=wpa_supplicant@{{ discovered_wireless_iface  }}.service
-Before=network-manager.service
-Before=netplan-wpa-{{ discovered_wireless_iface  }}.service
+Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
+Before=NetworkManager.service
+Before=netplan-wpa-{{ discovered_wireless_iface }}.service
 Before=network.target
 
 [Service]
@@ -16,4 +16,3 @@ ExecStart=/sbin/test-wifi
 
 [Install]
 WantedBy=multi-user.target
-