From 04a7fb44e076a92a975c5325cd9702d4963f6e6b Mon Sep 17 00:00:00 2001
From: Jim Gregory <github_acct@bikesatwork.com>
Date: Wed, 9 Nov 2022 04:30:49 -0600
Subject: [PATCH] fix errors when reconfiguring network (e.g. setting up a
 hotspot) (#161)

Calls to start/restart/stop/reload NetworkManager when manually
configuring a network would cause errors because the service was using
the wrong name ('network-manager' rather than 'NetworkManager').

Co-authored-by: Jim Gregory <jim@pedalpc.com>
---
 debian-config-functions-network | 4 ++--
 debian-config-jobs              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian-config-functions-network b/debian-config-functions-network
index c989069..7eeedb6 100644
--- a/debian-config-functions-network
+++ b/debian-config-functions-network
@@ -248,9 +248,9 @@ function reload-nety() {
 
 	systemctl daemon-reload
 	if [[ "$1" == "reload" ]]; then WHATODO="Reloading services"; else WHATODO="Stopping services"; fi
-	(service network-manager stop; echo 10; sleep 1; service hostapd stop; echo 20; sleep 1; service dnsmasq stop; echo 30; sleep 1;\
+	(service NetworkManager stop; echo 10; sleep 1; service hostapd stop; echo 20; sleep 1; service dnsmasq stop; echo 30; sleep 1;\
 	[[ "$1" == "reload" ]] && service dnsmasq start && echo 60 && sleep 1 && service hostapd start && echo 80 && sleep 1;\
-	service network-manager start; echo 90; sleep 5;) | dialog --backtitle "$BACKTITLE" --title " $WHATODO " --gauge "" 6 70 0
+	service NetworkManager start; echo 90; sleep 5;) | dialog --backtitle "$BACKTITLE" --title " $WHATODO " --gauge "" 6 70 0
 	systemctl restart systemd-resolved.service
 
 }
diff --git a/debian-config-jobs b/debian-config-jobs
index 86a12e2..bbda4d8 100644
--- a/debian-config-jobs
+++ b/debian-config-jobs
@@ -513,7 +513,7 @@ function jobs ()
 				rm -f /etc/network/interfaces.d/armbian.ap.nat
 				rm -f /etc/network/interfaces.d/armbian.ap.bridge
 				service networking restart
-				service network-manager restart
+				service NetworkManager restart
 				{ for ((i = 0 ; i <= 100 ; i+=20)); do sleep 1; echo $i; done } | dialog --title " Initializing wireless adapters " --colors --gauge "" 5 50 0
 
 				# start with basic config
@@ -522,7 +522,7 @@ function jobs ()
 				if grep -q "^## IEEE 802.11n" /etc/hostapd.conf; then sed '/## IEEE 802.11n/,/^## IEEE 802.11n/ s/.*/#&/' -i /etc/hostapd.conf; fi
 				sed -i "s/^channel=.*/channel=5/" /etc/hostapd.conf
 
-				service network-manager reload
+				service NetworkManager reload
 				# change special adapters to AP mode
 				wlan_exceptions "on"
 				# check for WLAN interfaces
@@ -535,7 +535,7 @@ function jobs ()
 					echo "[keyfile]" > /etc/NetworkManager/conf.d/10-ignore-interfaces.conf
 					echo "unmanaged-devices=interface-name:$WIRELESS_ADAPTER" >> /etc/NetworkManager/conf.d/10-ignore-interfaces.conf
 				fi
-				service network-manager reload
+				service NetworkManager reload
 				# display dialog
 				dialog --colors --backtitle "$BACKTITLE" --title "Please wait" --infobox \
 				"\nWireless adapter: \Z1${WIRELESS_ADAPTER}\Z0\n\nProbing nl80211 hostapd driver compatibility." 7 50