From afb3d192ed144c46b3b5145b0ceb9d69e1b596d6 Mon Sep 17 00:00:00 2001
From: gtxaspec <gtxent@gmail.com>
Date: Wed, 27 Dec 2023 23:28:53 -0800
Subject: [PATCH] [no ci] update network init script and configs

---
 general/overlay/etc/init.d/S40network          | 6 ++----
 general/overlay/etc/network/interfaces.d/eth0  | 1 +
 general/overlay/etc/network/interfaces.d/wlan0 | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/general/overlay/etc/init.d/S40network b/general/overlay/etc/init.d/S40network
index 800855c3..3bd42999 100755
--- a/general/overlay/etc/init.d/S40network
+++ b/general/overlay/etc/init.d/S40network
@@ -6,22 +6,20 @@ set_wireless() {
 	path=/etc/wireless
 	if $path/usb "$dev" || $path/modem "$dev" || $path/sdio "$dev"; then
 		[ -n "$mac" ] && ip link set dev wlan0 address "$mac"
-		ifup wlan0
-		ifconfig eth0 192.168.192.10
 	fi
 }
 
 case "$1" in
 	start)
 		echo "Starting network..."
-		ifup -a
 		[ -n "$dev" ] && set_wireless || ifup eth0
+		ifup -a
 		;;
 
 	stop)
 		echo "Stopping network..."
-		ifdown -a
 		[ -n "$dev" ] && ifdown wlan0 || ifdown eth0
+		ifdown -a
 		;;
 
 	restart|reload)
diff --git a/general/overlay/etc/network/interfaces.d/eth0 b/general/overlay/etc/network/interfaces.d/eth0
index d2cd4306..0d534202 100644
--- a/general/overlay/etc/network/interfaces.d/eth0
+++ b/general/overlay/etc/network/interfaces.d/eth0
@@ -1,2 +1,3 @@
+auto eth0
 iface eth0 inet dhcp
     hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66)
diff --git a/general/overlay/etc/network/interfaces.d/wlan0 b/general/overlay/etc/network/interfaces.d/wlan0
index 7bce98b9..f807c1e8 100644
--- a/general/overlay/etc/network/interfaces.d/wlan0
+++ b/general/overlay/etc/network/interfaces.d/wlan0
@@ -1,3 +1,4 @@
+auto wlan0
 iface wlan0 inet dhcp
     pre-up wpa_passphrase "$(fw_printenv -n wlanssid)" "$(fw_printenv -n wlanpass)" > /tmp/wpa_supplicant.conf
     pre-up sed -i 's/#psk.*/scan_ssid=1/g' /tmp/wpa_supplicant.conf