Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base-files: config_generate: reformat for better readability and quote variables

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47654
This commit is contained in:
Jo-Philipp Wich 2015-11-26 12:04:32 +00:00
parent 055ee48ab0
commit 92d414eb07
1 changed files with 122 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

232
package/base-files/files/bin/config_generate
View file

@ -7,17 +7,17 @@ CFG=/etc/board.json
[ -f $CFG ] || exit 1 [ -f $CFG ] || exit 1
generate_static_network() { generate_static_network() {
uci -q batch <<EOF uci -q batch <<-EOF
delete network.loopback delete network.loopback
set network.loopback='interface' set network.loopback='interface'
set network.loopback.ifname='lo' set network.loopback.ifname='lo'
set network.loopback.proto='static' set network.loopback.proto='static'
set network.loopback.ipaddr='127.0.0.1' set network.loopback.ipaddr='127.0.0.1'
set network.loopback.netmask='255.0.0.0' set network.loopback.netmask='255.0.0.0'
delete network.globals delete network.globals
set network.globals='globals' set network.globals='globals'
set network.globals.ula_prefix='auto' set network.globals.ula_prefix='auto'
EOF EOF
} }
next_vlan=3 next_vlan=3
@ -25,77 +25,84 @@ generate_network() {
local vlan local vlan
json_select network json_select network
json_select $1 json_select "$1"
json_get_vars ifname create_vlan macaddr json_get_vars ifname create_vlan macaddr
json_select .. json_select ..
json_select .. json_select ..
[ -n "$ifname" ] || return [ -n "$ifname" ] || return
[ "${create_vlan:-0}" -eq 1 ] && case $1 in
lan) vlan=1;;
wan) vlan=2;;
*)
vlan=$next_vlan
next_vlan=$((next_vlan + 1))
;;
esac
[ -n "$vlan" ] && ifname=${ifname}.${vlan}
uci -q batch <<EOF
delete network.$1
set network.$1='interface'
set network.$1.ifname='$ifname'
set network.$1.force_link=1
set network.$1.proto='none'
set network.$1.macaddr='$macaddr'
EOF
case $1 in if [ "${create_vlan:-0}" -eq 1 ]; then
lan) uci -q batch <<EOF case "$1" in
set network.$1.type='bridge' lan) vlan=1;;
set network.$1.proto='static' wan) vlan=2;;
set network.$1.ipaddr='192.168.1.1' *)
set network.$1.netmask='255.255.255.0' vlan=$next_vlan
set network.$1.ip6assign='60' next_vlan=$((next_vlan + 1))
EOF ;;
esac
fi
[ -n "$vlan" ] && ifname=${ifname}.${vlan}
uci -q batch <<-EOF
delete network.$1
set network.$1='interface'
set network.$1.ifname='$ifname'
set network.$1.force_link=1
set network.$1.proto='none'
set network.$1.macaddr='$macaddr'
EOF
case "$1" in
lan)
uci -q batch <<-EOF
set network.$1.type='bridge'
set network.$1.proto='static'
set network.$1.ipaddr='192.168.1.1'
set network.$1.netmask='255.255.255.0'
set network.$1.ip6assign='60'
EOF
;; ;;
wan) uci -q batch <<EOF wan)
set network.$1.proto='dhcp' uci -q batch <<-EOF
delete network.wan6 set network.$1.proto='dhcp'
set network.wan6='interface' delete network.wan6
set network.wan6.ifname='$ifname' set network.wan6='interface'
set network.wan6.proto='dhcpv6' set network.wan6.ifname='$ifname'
EOF set network.wan6.proto='dhcpv6'
EOF
;; ;;
esac esac
} }
generate_switch_vlan() { generate_switch_vlan() {
local device=$1 local device="$1"
local vlan=$2 local vlan="$2"
local cpu_port=$3 local cpu_port="$3"
case $vlan in case "$vlan" in
lan) vlan=1;; lan) vlan=1;;
wan) vlan=2;; wan) vlan=2;;
*) vlan=${vlan##vlan};; *) vlan="${vlan##vlan}";;
esac esac
json_select vlans json_select vlans
json_select $2 json_select "$2"
json_get_values ports json_get_values ports
json_select .. json_select ..
json_select .. json_select ..
uci -q batch <<EOF uci -q batch <<-EOF
add network switch_vlan add network switch_vlan
set network.@switch_vlan[-1].device='$device' set network.@switch_vlan[-1].device='$device'
set network.@switch_vlan[-1].vlan='$vlan' set network.@switch_vlan[-1].vlan='$vlan'
set network.@switch_vlan[-1].ports='$ports ${cpu_port}t' set network.@switch_vlan[-1].ports='$ports ${cpu_port}t'
EOF EOF
} }
calculate_switch_vlans() { calculate_switch_vlans() {
local switch=$1 local switch="$1"
local ports port attr val local ports port attr val
local prev_role local prev_role
local num device role index local num device role index
@ -204,45 +211,50 @@ calculate_switch_vlans() {
EOF EOF
case $role in case $role in
lan) uci -q batch <<-EOF lan)
set network.lan.type='bridge' uci -q batch <<-EOF
set network.lan.proto='static' set network.lan.type='bridge'
set network.lan.ipaddr='192.168.1.1' set network.lan.proto='static'
set network.lan.netmask='255.255.255.0' set network.lan.ipaddr='192.168.1.1'
set network.lan.ip6assign='60' set network.lan.netmask='255.255.255.0'
EOF set network.lan.ip6assign='60'
EOF
;; ;;
wan) uci -q batch <<-EOF
set network.wan.proto='dhcp' wan)
set network.wan6='interface' uci -q batch <<-EOF
set network.wan6.ifname='$device' set network.wan.proto='dhcp'
set network.wan6.proto='dhcpv6' set network.wan6='interface'
EOF set network.wan6.ifname='$device'
set network.wan6.proto='dhcpv6'
EOF
;; ;;
*) uci -q batch <<-EOF
set network.$role.force_link='1' *)
set network.$role.proto='none' uci -q batch <<-EOF
EOF set network.$role.force_link='1'
set network.$role.proto='none'
EOF
;; ;;
esac esac
done done
} }
generate_switch() { generate_switch() {
local key=$1 local key="$1"
local vlans local vlans
json_select switch json_select switch
json_select $key json_select "$key"
json_get_vars enable reset blinkrate cpu_port json_get_vars enable reset blinkrate cpu_port
uci -q batch <<EOF uci -q batch <<-EOF
add network switch add network switch
set network.@switch[-1].name='$key' set network.@switch[-1].name='$key'
set network.@switch[-1].reset='$reset' set network.@switch[-1].reset='$reset'
set network.@switch[-1].enable_vlan='$enable' set network.@switch[-1].enable_vlan='$enable'
set network.@switch[-1].blinkrate='$blinkrate' set network.@switch[-1].blinkrate='$blinkrate'
EOF EOF
if [ -n "$cpu_port" ]; then if [ -n "$cpu_port" ]; then
json_get_keys vlans vlans json_get_keys vlans vlans
@ -256,40 +268,40 @@ EOF
} }
generate_led() { generate_led() {
local key=$1 local key="$1"
local cfg="led_$key" local cfg="led_$key"
json_select led json_select led
json_select $key json_select "$key"
json_get_vars name sysfs type trigger device interface default port_mask json_get_vars name sysfs type trigger device interface default port_mask
json_select .. json_select ..
json_select .. json_select ..
uci -q batch <<EOF uci -q batch <<-EOF
delete system.$cfg delete system.$cfg
set system.$cfg='led' set system.$cfg='led'
set system.$cfg.name='$name' set system.$cfg.name='$name'
set system.$cfg.sysfs='$sysfs' set system.$cfg.sysfs='$sysfs'
set system.$cfg.dev='$device' set system.$cfg.dev='$device'
set system.$cfg.trigger='$trigger' set system.$cfg.trigger='$trigger'
set system.$cfg.port_mask='$port_mask' set system.$cfg.port_mask='$port_mask'
set system.$cfg.default='$default' set system.$cfg.default='$default'
EOF EOF
case $type in
netdev)
uci -q batch <<EOF
set system.$cfg.trigger='netdev'
set system.$cfg.mode='link tx rx'
EOF
;;
usb) case "$type" in
uci -q batch <<EOF netdev)
set system.$cfg.trigger='usbdev' uci -q batch <<-EOF
set system.$cfg.interval='50' set system.$cfg.trigger='netdev'
EOF set system.$cfg.mode='link tx rx'
;; EOF
;;
usb)
uci -q batch <<-EOF
set system.$cfg.trigger='usbdev'
set system.$cfg.interval='50'
EOF
;;
esac esac
} }