1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:03:08 +02:00

cleanup code, fix debug output

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@184 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2004-12-11 07:28:27 +00:00
parent d33ab6253a
commit d2372d1532

View File

@ -12,19 +12,22 @@ nvram () {
. /etc/nvram.overrides
# valid interface?
if_valid () (
[ "${1%%[0-9]}" = "vlan" ] && {
i=${1#vlan}
hwname=$(nvram get vlan${i}hwname)
hwaddr=$(nvram get ${hwname}macaddr)
[ -z "$hwaddr" ] && return 1
if_valid () {
ifconfig "$1" >&- 2>&- ||
[ "${1%%[0-9]}" = "br" ] ||
{
[ "${1%%[0-9]}" = "vlan" ] && (
i=${1#vlan}
hwname=$(nvram get vlan${i}hwname)
hwaddr=$(nvram get ${hwname}macaddr)
[ -z "$hwaddr" ] && return 1
vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)
debug "# vlan$i: $hwname $hwaddr => $vif"
vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)
debug "# vlan$i => $vif"
$DEBUG ifconfig $vif up
$DEBUG vconfig add $vif $i 2>/dev/null
}
ifconfig "$1" >/dev/null 2>&1 || [ "${1%%[0-9]}" = "br" ]
[ $? = 0 ] || { echo -e "# $1 ignored: no such interface"; return 1; }
)
$DEBUG ifconfig $vif up
$DEBUG vconfig add $vif $i 2>&-
)
} ||
{ echo -e "# $1 ignored: can't find/create"; false; }
}