From 82f04042bf4e80e2f4e71f13bd6f526b8b34f218 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 30 Sep 2024 17:44:32 +0200 Subject: [PATCH 1/3] Remove deprecated wireless-tools from packages - alternative (iw) is shipped --- config/cli/bullseye/main/packages | 1 - config/cli/common/main/packages | 1 - config/cli/jammy/main/packages | 1 - 3 files changed, 3 deletions(-) diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages index ff32e73b18fe..7cfdcdacc856 100644 --- a/config/cli/bullseye/main/packages +++ b/config/cli/bullseye/main/packages @@ -41,5 +41,4 @@ u-boot-tools usbutils vlan wget -wireless-tools wpasupplicant diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages index 0faab4d1a1ff..d07c23820681 100644 --- a/config/cli/common/main/packages +++ b/config/cli/common/main/packages @@ -39,6 +39,5 @@ tzdata u-boot-tools usbutils wget -wireless-tools wireguard-tools wpasupplicant diff --git a/config/cli/jammy/main/packages b/config/cli/jammy/main/packages index ff32e73b18fe..7cfdcdacc856 100644 --- a/config/cli/jammy/main/packages +++ b/config/cli/jammy/main/packages @@ -41,5 +41,4 @@ u-boot-tools usbutils vlan wget -wireless-tools wpasupplicant From 3737f075b76ce857b89be6b03708cc7a8bc2b1d0 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 30 Sep 2024 18:07:56 +0200 Subject: [PATCH 2/3] Replace wireless-tools app with iw in armbian-first-login --- packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin index bd79de98f51d..58d4b6506e85 100755 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin @@ -307,7 +307,7 @@ set_timezone_and_locales() { while [[ ${scanning} -lt 3 ]]; do sleep 0.5 scanning=$(( scanning + 1 )) - readarray -t ARRAY < <(iwlist ${WIFI_DEVICE} scanning 2> /dev/null | egrep 'ESSID' | sed 's/^[ \t]*//' | sed 's/"//g' | sed 's/ESSID://' | sed '/^$/d' | sort | uniq | awk 'BEGIN{FS=OFS=","} {$NF=++count OFS $NF} 1') + readarray -t ARRAY < <(iw dev ${WIFI_DEVICE} scan 2> /dev/null | egrep 'SSID' | sed 's/^[ \t]*//' | sed 's/"//g' | sed 's/SSID: //' | sed '/^$/d' | sort | uniq | awk 'BEGIN{FS=OFS=","} {$NF=++count OFS $NF} 1') if [[ ${#ARRAY[@]} -gt 0 ]]; then broken=0; break; fi done # wifi can also fail From dcfc69d4e775555bd2b3cadfe67a40cebc5fbcd1 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 30 Sep 2024 18:13:01 +0200 Subject: [PATCH 3/3] Switch from wireless-tools in disabling power management --- packages/bsp/99disable-power-management | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bsp/99disable-power-management b/packages/bsp/99disable-power-management index 341a269d8ab1..f3ced3f62cce 100644 --- a/packages/bsp/99disable-power-management +++ b/packages/bsp/99disable-power-management @@ -1,5 +1,5 @@ #!/bin/sh case "$2" in - up) /sbin/iwconfig $1 power off || true ;; - down) /sbin/iwconfig $1 power on || true ;; + up) iw dev $1 set power_save off || true ;; + down) iw dev $1 set power_save on || true ;; esac