From 070b0bff9380577f17e8bea84634dd2556405f53 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 30 Jul 2020 17:25:20 +0200 Subject: [PATCH] target: replace remaining occurrences of ifconfig with ip ifconfig is effectively deprecated for quite some time now. Let's replace the remaining occurrences for our target setup by the corresponding ip commands now. Note that this does not touch ar71xx, as it will be dropped anyway, and changing it would only make backports harder. Signed-off-by: Adrian Schmutzler --- .../base-files/lib/preinit/05_set_iface_mac_apm821xx | 4 ++-- .../base-files/lib/preinit/15_preinit_iface_atheros | 9 +++++---- .../mediatek/base-files/lib/preinit/05_set_preinit_iface | 2 +- target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx index 1a27930d24..a76d4a8dac 100644 --- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx @@ -6,8 +6,8 @@ preinit_set_mac_address() { case $(board_name) in meraki,mr24|\ meraki,mx60) - mac_lan=$(mtd_get_mac_binary_ubi board-config 102) - [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan" + mac_lan=$(mtd_get_mac_binary_ubi board-config 0x66) + [ -n "$mac_lan" ] && ip link set eth0 address "$mac_lan" ;; esac } diff --git a/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros index bd46cb9084..2b296539ac 100644 --- a/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros +++ b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros @@ -7,7 +7,7 @@ preinit_ip() { if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then vconfig set_name_type DEV_PLUS_VID_NO_PAD - ifconfig eth0 up + ip link set eth0 up vconfig add eth0 1 ifname=eth0.1 else @@ -17,7 +17,8 @@ preinit_ip() { } fi [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up + ip addr add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $pi_ifname + ip link set $pi_ifname up } } @@ -28,8 +29,8 @@ preinit_ip_deconfig() { if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then vconfig rem eth0.1 2>/dev/null - ifconfig $pi_ifname down + ip link set $pi_ifname down elif [ -n "$pi_ifname" ]; then - ifconfig $pi_ifname 0.0.0.0 + ip -4 addr flush dev $pi_ifname fi } diff --git a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface index eb0bed8607..78ec426287 100644 --- a/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface +++ b/target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface @@ -1,7 +1,7 @@ #!/bin/sh set_preinit_iface() { - ifconfig eth0 up + ip link set eth0 up ifname=lan1 } diff --git a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh index 170cfd5b29..f24da4dd28 100755 --- a/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh +++ b/target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh @@ -4,9 +4,9 @@ do_b53_hack() { . /lib/functions.sh # hack: enable switch on Lamobo R1 and reset counters - case "$(board_name)" in + case $(board_name) in "lamobo,lamobo-r1") - ifconfig eth0 up + ip link set eth0 up sleep 1 swconfig dev switch0 set reset 1 swconfig dev switch0 set reset_mib 1