From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Thu, 30 Jul 2020 15:25:20 +0000 (+0200)
Subject: target: replace remaining occurrences of ifconfig with ip
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=356866c481cf74e87b9025ebbfdef0995674dca3;p=openwrt%2Fstaging%2Fnbd.git

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 <freifunk@adrianschmutzler.de>
---

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 1f8c1c29fb..5f92c01931 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
@@ -5,7 +5,7 @@ preinit_set_mac_address() {
 		meraki,mr24|\
 		meraki,mx60)
 			mac_lan=$(mtd_get_mac_binary_ubi board-config 0x66)
-			[ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan"
+			[ -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 6b77f393a9..235ba4befc 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
@@ -5,7 +5,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
@@ -15,7 +15,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
 	}
 }
 
@@ -26,8 +27,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 8d282818c6..f39e8aee8d 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,5 +1,5 @@
 set_preinit_iface() {
-	ifconfig eth0 up
+	ip link set eth0 up
 	ifname=lan1
 }
 
diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
index 9a0da1716d..0f4660d242 100644
--- a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
+++ b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master
@@ -14,7 +14,7 @@ mt7621_bringup_dsa_master() {
         ;;
     esac
 
-    ifconfig $masterif up
+    ip link set $masterif up
 }
 
 boot_hook_add preinit_main mt7621_bringup_dsa_master
\ No newline at end of file
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 6ad8f57620..cc0c67acc7 100644
--- 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,7 +4,7 @@ do_b53_hack() {
 	# hack: enable switch on Lamobo R1 and reset counters
 	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