base-files: fix wan6 interface config generation for pppoe

[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 2036ae44fe133ee60e13574b234af1122f044c92..a8311fc595babdfeddd6d84ecf21799d0bd4c9f2 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -4,7 +4,8 @@ CFG=/etc/board.json
 
 . /usr/share/libubox/jshn.sh
 
-[ -f $CFG ] || exit 1
+[ -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
@@ -118,17 +119,14 @@ generate_network() {
                ;;
 
                pppoe)
-                       # fixup IPv6 slave interface
-                       ifname="pppoe-$1"
-
                        uci -q batch <<-EOF
                                set network.$1.proto='pppoe'
                                set network.$1.username='username'
                                set network.$1.password='password'
-                               set network.$1.ipv6='auto'
+                               set network.$1.ipv6='1'
                                delete network.${1}6
                                set network.${1}6='interface'
-                               set network.${1}6.ifname='$ifname'
+                               set network.${1}6.ifname='@${1}'
                                set network.${1}6.proto='dhcpv6'
                        EOF
                ;;
@@ -225,18 +223,20 @@ generate_static_system() {
        uci -q batch <<-EOF
                delete system.@system[0]
                add system system
-               set system.@system[-1].hostname='lede'
+               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
@@ -332,6 +332,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
@@ -354,6 +363,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
@@ -381,7 +398,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 ..
@@ -390,24 +407,28 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"
 
-generate_static_network
-
-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
+if [ ! -s /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
 
-generate_static_system
+       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 [ ! -s /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
+fi
 uci commit