base-files: rework config generation logic
[openwrt/openwrt.git] / package / base-files / files / bin / config_generate
index 550de0eebf80e5a95cf63bcdf86bf9ab196321e4..fe5fa85c879ede9066fc08d7190300f4c91f50c7 100755 (executable)
@@ -5,6 +5,7 @@ CFG=/etc/board.json
 . /usr/share/libubox/jshn.sh
 
 [ -f $CFG ] || exit 1
+[ -f /etc/config/network -a -f /etc/config/system ] && exit 0
 
 generate_static_network() {
        uci -q batch <<-EOF
@@ -42,7 +43,7 @@ generate_static_network() {
                                        json_get_vars type annex firmware tone xfer_mode
                                        uci -q batch <<-EOF
                                                delete network.dsl
-                                               set network.dsl='$type'
+                                               set network.dsl='dsl'
                                                set network.dsl.annex='$annex'
                                                set network.dsl.firmware='$firmware'
                                                set network.dsl.tone='$tone'
@@ -56,11 +57,11 @@ generate_static_network() {
 
 addr_offset=2
 generate_network() {
-       local ifname macaddr protocol type
+       local ifname macaddr protocol type ipaddr netmask
 
        json_select network
                json_select "$1"
-                       json_get_vars ifname macaddr protocol
+                       json_get_vars ifname macaddr protocol ipaddr netmask
                json_select ..
        json_select ..
 
@@ -88,16 +89,18 @@ generate_network() {
 
        case "$protocol" in
                static)
-                       local ipaddr
+                       local ipad
                        case "$1" in
-                               lan) ipaddr="192.168.1.1" ;;
-                               *) ipaddr="192.168.$((addr_offset++)).1" ;;
+                               lan) ipad=${ipaddr:-"192.168.1.1"} ;;
+                               *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
                        esac
 
+                       netm=${netmask:-"255.255.255.0"}
+
                        uci -q batch <<-EOF
                                set network.$1.proto='static'
-                               set network.$1.ipaddr='$ipaddr'
-                               set network.$1.netmask='255.255.255.0'
+                               set network.$1.ipaddr='$ipad'
+                               set network.$1.netmask='$netm'
                                set network.$1.ip6assign='60'
                        EOF
                ;;
@@ -141,55 +144,59 @@ generate_switch_vlans_ports() {
        # autogenerate vlans
        #
 
-       json_get_keys roles roles
-       json_select roles
+       if json_is_a roles array; then
+               json_get_keys roles roles
+               json_select roles
 
-       for role in $roles; do
-               json_select "$role"
-                       json_get_vars ports
-               json_select ..
+               for role in $roles; do
+                       json_select "$role"
+                               json_get_vars ports
+                       json_select ..
 
-               uci -q batch <<-EOF
-                       add network switch_vlan
-                       set network.@switch_vlan[-1].device='$switch'
-                       set network.@switch_vlan[-1].vlan='$role'
-                       set network.@switch_vlan[-1].ports='$ports'
-               EOF
-       done
+                       uci -q batch <<-EOF
+                               add network switch_vlan
+                               set network.@switch_vlan[-1].device='$switch'
+                               set network.@switch_vlan[-1].vlan='$role'
+                               set network.@switch_vlan[-1].ports='$ports'
+                       EOF
+               done
 
-       json_select ..
+               json_select ..
+       fi
 
 
        #
        # write port specific settings
        #
 
-       json_get_keys ports ports
-       json_select ports
+       if json_is_a ports array; then
+               json_get_keys ports ports
+               json_select ports
+
+               for port in $ports; do
+                       json_select "$port"
+                               json_get_vars num
+
+                               if json_is_a attr object; then
+                                       json_get_keys attr attr
+                                       json_select attr
+                                               uci -q batch <<-EOF
+                                                       add network switch_port
+                                                       set network.@switch_port[-1].device='$switch'
+                                                       set network.@switch_port[-1].port=$num
+                                               EOF
+
+                                               for attr in $attr; do
+                                                       json_get_var val "$attr"
+                                                       uci -q set network.@switch_port[-1].$attr="$val"
+                                               done
+                                       json_select ..
+                               fi
+                       json_select ..
+               done
 
-       for port in $ports; do
-               json_select "$port"
-                       json_get_vars num
-
-                       if json_is_a attr object; then
-                               json_get_keys attr attr
-                               json_select attr
-                                       uci -q batch <<-EOF
-                                               add network switch_port
-                                               set network.@switch_port[-1].device='$switch'
-                                               set network.@switch_port[-1].port=$num
-                                       EOF
-
-                                       for attr in $attr; do
-                                               json_get_var val "$attr"
-                                               uci -q set network.@switch_port[-1].$attr="$val"
-                                       done
-                               json_select ..
-                       fi
                json_select ..
-       done
-
-       json_select ..
+       fi
 }
 
 generate_switch() {
@@ -214,6 +221,50 @@ generate_switch() {
        json_select ..
 }
 
+
+generate_static_system() {
+       uci -q batch <<-EOF
+               delete system.@system[0]
+               add system system
+               set system.@system[-1].hostname='lede'
+               set system.@system[-1].timezone='UTC'
+               set system.@system[-1].ttylogin='0'
+
+               delete system.ntp
+               set system.ntp='timeserver'
+               set system.ntp.enabled='1'
+               set system.ntp.enable_server='0'
+               add_list system.ntp.server='0.openwrt.pool.ntp.org'
+               add_list system.ntp.server='1.openwrt.pool.ntp.org'
+               add_list system.ntp.server='2.openwrt.pool.ntp.org'
+               add_list system.ntp.server='3.openwrt.pool.ntp.org'
+       EOF
+
+       if json_is_a system object; then
+               json_select system
+                       local hostname
+                       if json_get_var hostname hostname; then
+                               uci -q set "system.@system[-1].hostname=$hostname"
+                       fi
+
+                       if json_is_a ntpserver array; then
+                               local keys key
+                               json_get_keys keys ntpserver
+                               json_select ntpserver
+                                       uci -q delete "system.ntp.server"
+
+                                       for key in $keys; do
+                                               local server
+                                               if json_get_var server "$key"; then
+                                                       uci -q add_list "system.ntp.server=$server"
+                                               fi
+                                       done
+                               json_select ..
+                       fi
+               json_select ..
+       fi
+}
+
 generate_rssimon() {
        local key="$1"
        local cfg="rssid_$key"
@@ -304,6 +355,14 @@ generate_led() {
                        EOF
                ;;
 
+               portstate)
+                       local port_state
+                       json_get_vars port_state
+                       uci -q batch <<-EOF
+                               set system.$cfg.port_state='$port_state'
+                       EOF
+               ;;
+
                timer|oneshot)
                        local delayon delayoff
                        json_get_vars delayon delayoff
@@ -340,21 +399,27 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"
 
-generate_static_network
+if [ ! -f /etc/config/network ]; then
+       touch /etc/config/network
+       generate_static_network
 
-json_get_keys keys network
-for key in $keys; do generate_network $key; done
+       json_get_keys keys network
+       for key in $keys; do generate_network $key; done
 
-json_get_keys keys switch
-for key in $keys; do generate_switch $key; done
+       json_get_keys keys switch
+       for key in $keys; do generate_switch $key; done
+fi
 
-json_get_keys keys rssimon
-for key in $keys; do generate_rssimon $key; done
+if [ ! -f /etc/config/system ]; then
+       touch /etc/config/system
+       generate_static_system
 
-json_get_keys keys gpioswitch
-for key in $keys; do generate_gpioswitch $key; done
+       json_get_keys keys rssimon
+       for key in $keys; do generate_rssimon $key; done
 
-json_get_keys keys led
-for key in $keys; do generate_led $key; done
+       json_get_keys keys gpioswitch
+       for key in $keys; do generate_gpioswitch $key; done
 
+       json_get_keys keys led
+       for key in $keys; do generate_led $key; done
 uci commit