base-files: Changed UCI variable name for GPIO value from 'default' to 'value'

[openwrt/openwrt.git] / package / base-files / files / bin / config_generate

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index fe5fa85c879ede9066fc08d7190300f4c91f50c7..f9b4e5ca9ef790c07a3b715f676ec4705f7168f1 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -4,8 +4,8 @@ CFG=/etc/board.json
 
 . /usr/share/libubox/jshn.sh
 
-[ -f $CFG ] || exit 1
-[ -f /etc/config/network -a -f /etc/config/system ] && exit 0
+[ -s $CFG ] || /bin/board_detect || exit 1
+[ -s /etc/config/network -a -s /etc/config/system ] && exit 0
 
 generate_static_network() {
        uci -q batch <<-EOF
@@ -229,15 +229,17 @@ generate_static_system() {
                set system.@system[-1].hostname='lede'
                set system.@system[-1].timezone='UTC'
                set system.@system[-1].ttylogin='0'
+               set system.@system[-1].log_size='64'
+               set system.@system[-1].urandom_seed='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'
+               add_list system.ntp.server='0.lede.pool.ntp.org'
+               add_list system.ntp.server='1.lede.pool.ntp.org'
+               add_list system.ntp.server='2.lede.pool.ntp.org'
+               add_list system.ntp.server='3.lede.pool.ntp.org'
        EOF
 
        if json_is_a system object; then
@@ -333,6 +335,15 @@ generate_led() {
                        EOF
                ;;
 
+               usbport)
+                       local ports port
+                       json_get_values ports ports
+                       uci set system.$cfg.trigger='usbport'
+                       for port in $ports; do
+                               uci add_list system.$cfg.port=$port
+                       done
+               ;;
+
                rssi)
                        local iface minq maxq offset factor
                        json_get_vars iface minq maxq offset factor
@@ -390,7 +401,7 @@ generate_gpioswitch() {
                                set system.$cfg='gpio_switch'
                                set system.$cfg.name='$name'
                                set system.$cfg.gpio_pin='$pin'
-                               set system.$cfg.default='$default'
+                               set system.$cfg.value='$default'
                        EOF
                json_select ..
        json_select ..
@@ -399,7 +410,7 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"
 
-if [ ! -f /etc/config/network ]; then
+if [ ! -s /etc/config/network ]; then
        touch /etc/config/network
        generate_static_network
 
@@ -410,7 +421,7 @@ if [ ! -f /etc/config/network ]; then
        for key in $keys; do generate_switch $key; done
 fi
 
-if [ ! -f /etc/config/system ]; then
+if [ ! -s /etc/config/system ]; then
        touch /etc/config/system
        generate_static_system
 
@@ -422,4 +433,5 @@ if [ ! -f /etc/config/system ]; then
 
        json_get_keys keys led
        for key in $keys; do generate_led $key; done
+fi
 uci commit