cleanup code, fix debug output

SVN-Revision: 184
This commit is contained in:
Mike Baker 2004-12-11 07:28:27 +00:00
parent f0f8f6d62e
commit 9d1a5b497c

View file

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