base-files: also generate configs when current is empty (FS#193)

[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 43d5c3b0b139f14af1a18bc57cd9b43f7f14d46c..80e5c9f47471329bf2c154cbcd69687fdf079ab2 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
@@ -399,7 +401,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 +412,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