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>
This commit is contained in:
Jim Gregory
2022-11-09 04:30:49 -06:00
committed by GitHub
parent 9c793ad4c8
commit 04a7fb44e0
2 changed files with 5 additions and 5 deletions

View File

@@ -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
}

View File

@@ -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