From 78043c650aff316a67fc53fd3b9e61343fbd28fd Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Wed, 27 Dec 2023 17:19:33 +0100 Subject: [PATCH] [no ci] Overlay: remove ethernet workaround from wireless scripts (#1212) --- general/overlay/etc/init.d/S40network | 9 ++++----- general/overlay/etc/wireless/interfaces/eth0 | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 general/overlay/etc/wireless/interfaces/eth0 diff --git a/general/overlay/etc/init.d/S40network b/general/overlay/etc/init.d/S40network index c6772c9e..800855c3 100755 --- a/general/overlay/etc/init.d/S40network +++ b/general/overlay/etc/init.d/S40network @@ -6,7 +6,8 @@ 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 && file="-i /etc/wireless/interfaces/eth0" + ifup wlan0 + ifconfig eth0 192.168.192.10 fi } @@ -14,15 +15,13 @@ case "$1" in start) echo "Starting network..." ifup -a - [ -n "$dev" ] && set_wireless - ifup eth0 $file + [ -n "$dev" ] && set_wireless || ifup eth0 ;; stop) echo "Stopping network..." ifdown -a - [ -n "$dev" ] && ifdown wlan0 - ifdown eth0 + [ -n "$dev" ] && ifdown wlan0 || ifdown eth0 ;; restart|reload) diff --git a/general/overlay/etc/wireless/interfaces/eth0 b/general/overlay/etc/wireless/interfaces/eth0 deleted file mode 100644 index 0f75b509..00000000 --- a/general/overlay/etc/wireless/interfaces/eth0 +++ /dev/null @@ -1,4 +0,0 @@ -iface eth0 inet static - address 192.168.2.10 - netmask 255.255.255.0 - hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66)