From ff8dbe996c09a849e51d1704ba121098b741f16b Mon Sep 17 00:00:00 2001
From: orangepi-xunlong <258384131@qq.com>
Date: Wed, 30 Mar 2022 20:15:31 +0800
Subject: [PATCH] Debian11: Debian12: fix hostapd

---
 .../debian-config-functions-network                |  4 ++--
 .../sources/orangepi-config/debian-config-jobs     | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/external/cache/sources/orangepi-config/debian-config-functions-network b/external/cache/sources/orangepi-config/debian-config-functions-network
index 60c171a..b3a2d7f 100755
--- a/external/cache/sources/orangepi-config/debian-config-functions-network
+++ b/external/cache/sources/orangepi-config/debian-config-functions-network
@@ -247,9 +247,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 network-manager stop >/dev/null 2>&1; service NetworkManager stop >/dev/null 2>&1; 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 network-manager start >/dev/null 2>&1; service NetworkManager start >/dev/null 2>&1; echo 90; sleep 5;) | dialog --backtitle "$BACKTITLE" --title " $WHATODO " --gauge "" 6 70 0
 	systemctl restart systemd-resolved.service
 
 }
diff --git a/external/cache/sources/orangepi-config/debian-config-jobs b/external/cache/sources/orangepi-config/debian-config-jobs
index 51d6e2e..ab79bf8 100644
--- a/external/cache/sources/orangepi-config/debian-config-jobs
+++ b/external/cache/sources/orangepi-config/debian-config-jobs
@@ -493,7 +493,8 @@ function jobs ()
 				iptables -t nat -D POSTROUTING 1 >/dev/null 2>&1
 				rm -f /etc/iptables.ipv4.nat
 				systemctl stop orangepi-restore-iptables.service
-				systemctl disable orangepi-restore-iptables.service				rm -f /var/run/hostapd/* >/dev/null 2>&1
+				systemctl disable orangepi-restore-iptables.service
+				rm -f /var/run/hostapd/* >/dev/null 2>&1
 				sed -i '/^iptables/ d' /etc/rc.local
 				sed -i '/^service dnsmasq/ d' /etc/rc.local
 				sed 's/interface-name:wl.*//' -i /etc/NetworkManager/conf.d/10-ignore-interfaces.conf
@@ -520,7 +521,8 @@ function jobs ()
 				rm -f /etc/network/interfaces.d/orangepi.ap.nat
 				rm -f /etc/network/interfaces.d/orangepi.ap.bridge
 				service networking restart
-				service network-manager restart
+				service network-manager restart >/dev/null 2>&1
+				service NetworkManager restart >/dev/null 2>&1
 				{ 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
@@ -529,7 +531,8 @@ 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 network-manager reload >/dev/null 2>&1
+				service NetworkManager reload >/dev/null 2>&1
 				# change special adapters to AP mode
 				wlan_exceptions "on"
 				# check for WLAN interfaces
@@ -542,7 +545,8 @@ 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 network-manager reload >/dev/null 2>&1
+				service NetworkManager reload >/dev/null 2>&1
 				# display dialog
 				dialog --colors --backtitle "$BACKTITLE" --title "Please wait" --infobox \
 				"\nWireless adapter: \Z1${WIRELESS_ADAPTER}\Z0\n\nProbing nl80211 hostapd driver compatibility." 7 50
@@ -697,7 +701,7 @@ function jobs ()
 							mv $TEMP_CONF".tmp" $TEMP_CONF
 							#reboot
 						fi
-					else
+				else
 						ifdown $WIRELESS_ADAPTER 2> /dev/null
 						sleep 2
 						ifup $WIRELESS_ADAPTER 2> /dev/null