mirror of https://github.com/hak5/openwrt.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>master
parent
1d9542c50e
commit
356866c481
|
@ -5,7 +5,7 @@ preinit_set_mac_address() {
|
||||||
meraki,mr24|\
|
meraki,mr24|\
|
||||||
meraki,mx60)
|
meraki,mx60)
|
||||||
mac_lan=$(mtd_get_mac_binary_ubi board-config 0x66)
|
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
|
esac
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ preinit_ip() {
|
||||||
if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
|
if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
|
||||||
-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
|
-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
|
||||||
vconfig set_name_type DEV_PLUS_VID_NO_PAD
|
vconfig set_name_type DEV_PLUS_VID_NO_PAD
|
||||||
ifconfig eth0 up
|
ip link set eth0 up
|
||||||
vconfig add eth0 1
|
vconfig add eth0 1
|
||||||
ifname=eth0.1
|
ifname=eth0.1
|
||||||
else
|
else
|
||||||
|
@ -15,7 +15,8 @@ preinit_ip() {
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
[ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
|
[ -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 \
|
if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
|
||||||
-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
|
-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
|
||||||
vconfig rem eth0.1 2>/dev/null
|
vconfig rem eth0.1 2>/dev/null
|
||||||
ifconfig $pi_ifname down
|
ip link set $pi_ifname down
|
||||||
elif [ -n "$pi_ifname" ]; then
|
elif [ -n "$pi_ifname" ]; then
|
||||||
ifconfig $pi_ifname 0.0.0.0
|
ip -4 addr flush dev $pi_ifname
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
set_preinit_iface() {
|
set_preinit_iface() {
|
||||||
ifconfig eth0 up
|
ip link set eth0 up
|
||||||
ifname=lan1
|
ifname=lan1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ mt7621_bringup_dsa_master() {
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
ifconfig $masterif up
|
ip link set $masterif up
|
||||||
}
|
}
|
||||||
|
|
||||||
boot_hook_add preinit_main mt7621_bringup_dsa_master
|
boot_hook_add preinit_main mt7621_bringup_dsa_master
|
|
@ -4,7 +4,7 @@ do_b53_hack() {
|
||||||
# hack: enable switch on Lamobo R1 and reset counters
|
# hack: enable switch on Lamobo R1 and reset counters
|
||||||
case $(board_name) in
|
case $(board_name) in
|
||||||
lamobo,lamobo-r1)
|
lamobo,lamobo-r1)
|
||||||
ifconfig eth0 up
|
ip link set eth0 up
|
||||||
sleep 1
|
sleep 1
|
||||||
swconfig dev switch0 set reset 1
|
swconfig dev switch0 set reset 1
|
||||||
swconfig dev switch0 set reset_mib 1
|
swconfig dev switch0 set reset_mib 1
|
||||||
|
|
Loading…
Reference in New Issue