wap54g support

[openwrt.git] / obsolete-buildroot / sources / openwrt / root / etc / functions.sh

diff --git a/obsolete-buildroot/sources/openwrt/root/etc/functions.sh b/obsolete-buildroot/sources/openwrt/root/etc/functions.sh
index 79db1da..6da7df2 100755 (executable)
--- a/obsolete-buildroot/sources/openwrt/root/etc/functions.sh
+++ b/obsolete-buildroot/sources/openwrt/root/etc/functions.sh
@@ -3,8 +3,11 @@
 alias debug=${DEBUG:-:}
 
 # allow env to override nvram
 alias debug=${DEBUG:-:}
 
 # allow env to override nvram

-nvram_get () {
- eval "echo \${$1:-\$(nvram get $1)}"
+nvram () {
+  case $1 in
+    get) eval "echo \${NVRAM_$2:-\$(command nvram get $2)}";;
+    *) command nvram $*;;
+  esac

 }
 . /etc/nvram.overrides
 
 }
 . /etc/nvram.overrides
 


@@ -12,8 +15,8 @@ nvram_get () {
 if_valid () (
   [ "${1%%[0-9]}" = "vlan" ] && {
     i=${1#vlan}
 if_valid () (
   [ "${1%%[0-9]}" = "vlan" ] && {
     i=${1#vlan}

-    hwname=$(nvram_get vlan${i}hwname)
-    hwaddr=$(nvram_get ${hwname}macaddr)
+    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)
     [ -z "$hwaddr" ] && return 1
 
     vif=$(ifconfig -a | awk '/^eth.*'$hwaddr'/ {print $1; exit}' IGNORECASE=1)