From b5c0892412013f36caabd79d239321b77482b57f Mon Sep 17 00:00:00 2001 From: thepeople Date: Tue, 18 Mar 2008 03:16:32 +0000 Subject: fix broken init file and some cleanup git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10613 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/admswconfig/files/admswconfig | 21 +++++++++++++-------- package/admswconfig/files/admswswitch.sh | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/admswconfig/files/admswconfig b/package/admswconfig/files/admswconfig index dd5524250..d3a056556 100644 --- a/package/admswconfig/files/admswconfig +++ b/package/admswconfig/files/admswconfig @@ -8,30 +8,34 @@ start() { mkdir -p /etc/config -adm5120_detect() { board_name=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo) case "$board_name" in "Compex WP54"*) - board="WP54";; + board="Compex WP54";; *) ;; esac -} -adm5120_detect + echo "$board" |awk ' + board=$1 + + function p(cfgname, name) { + if (c[name] != "") print " option " cfgname " \"" c[name] "\"" + } + BEGIN { FS="=" c["lan_ifname"]="eth0" c["wan_ifname"]="eth1" - c["eth0ports"]="12345" + c["eth0ports"]="1 2 3 4 5" c["eth1ports"]="0" } END { - if (model == "Compex WP54") { - c["vlan0ports"]="0" - c["vlan1ports"]="1" + if (board == "Compex WP54") { + c["eth0ports"]="0" + c["eth1ports"]="1" } print "#### VLAN configuration " @@ -65,3 +69,4 @@ adm5120_detect print " option proto dhcp" }' > /etc/config/network } + diff --git a/package/admswconfig/files/admswswitch.sh b/package/admswconfig/files/admswswitch.sh index c5898d5a3..32a60a82b 100644 --- a/package/admswconfig/files/admswswitch.sh +++ b/package/admswconfig/files/admswswitch.sh @@ -3,6 +3,7 @@ setup_switch_vlan() { config_get ports "$CONFIG_SECTION" "eth$1" + ports=`echo "$ports"| sed s/" "/""/g` admswconfig eth$1 ${ports}c } -- cgit v1.2.3