KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package: replace ifconfig-usage with ip

Browse source 
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 46832
This commit is contained in:
Steven Barth 2015-09-08 17:44:24 +00:00
parent 579fe7f52a
commit e07959cade
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
View file

@ -101,7 +101,7 @@ disable_broadcom() {
for dev in /sys/class/net/wds${device##wl}-* /sys/class/net/${device}-* /sys/class/net/${device}; do for dev in /sys/class/net/wds${device##wl}-* /sys/class/net/${device}-* /sys/class/net/${device}; do
if [ -e "$dev" ]; then if [ -e "$dev" ]; then
ifname=${dev##/sys/class/net/} ifname=${dev##/sys/class/net/}
ifconfig "$ifname" down ip link set dev "$ifname" down
unbridge "$ifname" unbridge "$ifname"
fi fi
done done
@ -372,8 +372,8 @@ enable_broadcom() {
local if_cmd="if_pre_up" local if_cmd="if_pre_up"
[ "$ifname" != "${ifname##${device}-}" ] && if_cmd="if_up" [ "$ifname" != "${ifname##${device}-}" ] && if_cmd="if_up"
append $if_cmd "macaddr=\$(wlc ifname '$ifname' cur_etheraddr)" ";$N" append $if_cmd "macaddr=\$(wlc ifname '$ifname' cur_etheraddr)" ";$N"
append $if_cmd "ifconfig '$ifname' \${macaddr:+hw ether \$macaddr}" ";$N" append $if_cmd "ip link set dev '$ifname' address \$macaddr" ";$N"
append if_up "ifconfig '$ifname' up" ";$N" append if_up "ip link set dev '$ifname' up" ";$N"
local net_cfg="$(find_net_config "$vif")" local net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || { [ -z "$net_cfg" ] || {

6
package/kernel/hostap-driver/files/lib/wifi/hostap.sh
View file

@ -78,7 +78,7 @@ disable_prism2() (
set $line set $line
[ -f "/var/run/wifi-${1}.pid" ] && [ -f "/var/run/wifi-${1}.pid" ] &&
kill "$(cat "/var/run/wifi-${1}.pid")" kill "$(cat "/var/run/wifi-${1}.pid")"
ifconfig "$1" down ip link set dev "$1" down
unbridge "$1" unbridge "$1"
iwpriv "$phy" wds_del "$2" iwpriv "$phy" wds_del "$2"
done done
@ -204,7 +204,7 @@ enable_prism2() {
hostapd_setup_vif "$vif" hostap || { hostapd_setup_vif "$vif" hostap || {
echo "enable_prism2($device): Failed to set up hostapd for interface $ifname" >&2 echo "enable_prism2($device): Failed to set up hostapd for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption # make sure this wifi interface won't accidentally stay open without encryption
ifconfig "$ifname" down ip link set dev "$ifname" down
continue continue
} }
fi fi
@ -213,7 +213,7 @@ enable_prism2() {
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
wpa_supplicant_setup_vif "$vif" wext || { wpa_supplicant_setup_vif "$vif" wext || {
echo "enable_prism2($device): Failed to set up wpa_supplicant for interface $ifname" >&2 echo "enable_prism2($device): Failed to set up wpa_supplicant for interface $ifname" >&2
ifconfig "$ifname" down ip link set dev "$ifname" down
continue continue
} }
fi fi

6
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View file

@ -486,7 +486,7 @@ mac80211_prepare_vif() {
# All interfaces must have unique mac addresses # All interfaces must have unique mac addresses
# which can either be explicitly set in the device # which can either be explicitly set in the device
# section, or automatically generated # section, or automatically generated
ifconfig "$ifname" hw ether "$macaddr" ip link set dev "$ifname" address "$macaddr"
fi fi
json_select .. json_select ..
@ -582,7 +582,7 @@ mac80211_setup_vif() {
json_get_vars mode json_get_vars mode
json_get_var vif_txpower txpower json_get_var vif_txpower txpower
ifconfig "$ifname" up || { ip link set dev "$ifname" up || {
wireless_setup_vif_failed IFUP_ERROR wireless_setup_vif_failed IFUP_ERROR
json_select .. json_select ..
return return
@ -638,7 +638,7 @@ mac80211_interface_cleanup() {
local phy="$1" local phy="$1"
for wdev in $(list_phy_interfaces "$phy"); do for wdev in $(list_phy_interfaces "$phy"); do
ifconfig "$wdev" down 2>/dev/null ip link set dev "$wdev" down 2>/dev/null
iw dev "$wdev" del iw dev "$wdev" del
done done
} }

4
package/kernel/trelay/files/trelay.init
View file

@ -13,8 +13,8 @@ check_relay() {
[ -d "/sys/kernel/debug/trelay/${dev1}-${dev2}" ] && return [ -d "/sys/kernel/debug/trelay/${dev1}-${dev2}" ] && return
[ -d "/sys/class/net/${dev1}" -a -d "/sys/class/net/${dev2}" ] || return [ -d "/sys/class/net/${dev1}" -a -d "/sys/class/net/${dev2}" ] || return
ifconfig "$dev1" up ip link set dev "$dev1" up
ifconfig "$dev2" up ip link set dev "$dev2" up
echo "${dev1}-${dev2},${dev1},${dev2}" > /sys/kernel/debug/trelay/add echo "${dev1}-${dev2},${dev1},${dev2}" > /sys/kernel/debug/trelay/add
} }

2
package/network/config/swconfig/files/switch.sh
View file

@ -5,7 +5,7 @@ setup_switch_dev() {
local name local name
config_get name "$1" name config_get name "$1" name
name="${name:-$1}" name="${name:-$1}"
[ -d "/sys/class/net/$name" ] && ifconfig "$name" up [ -d "/sys/class/net/$name" ] && ip link set dev "$name" up
swconfig dev "$name" load network swconfig dev "$name" load network
} }

2
package/network/services/openvpn/Makefile
View file

@ -62,7 +62,7 @@ endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
IFCONFIG=/sbin/ifconfig \ IFCONFIG=/sbin/ifconfig \
ROUTE=/sbin/route \ ROUTE=/sbin/route \
IPROUTE=/usr/sbin/ip \ IPROUTE=/sbin/ip \
NETSTAT=/sbin/netstat NETSTAT=/sbin/netstat
define Build/Configure define Build/Configure

4
package/utils/admswconfig/files/admswswitch.sh
View file

@ -4,9 +4,9 @@
setup_switch_vlan() { setup_switch_vlan() {
config_get ports "$CONFIG_SECTION" "eth$1" config_get ports "$CONFIG_SECTION" "eth$1"
ports=`echo "$ports"| sed s/" "/""/g` ports=`echo "$ports"| sed s/" "/""/g`
ifconfig eth$1 down ip link set dev eth$1 down
admswconfig eth$1 ${ports}c admswconfig eth$1 ${ports}c
ifconfig eth$1 up ip link set dev eth$1 up
} }
setup_switch() { setup_switch() {