diff --git a/bsp/default/root_file_system/etc/config/system.tpl b/bsp/default/root_file_system/etc/config/system.tpl deleted file mode 100644 index 47e1a7498f16fc4d70880fd93c711e22dc17a3c1..0000000000000000000000000000000000000000 --- a/bsp/default/root_file_system/etc/config/system.tpl +++ /dev/null @@ -1,29 +0,0 @@ -config 'system' - option 'hostname' 'OpenWrt' - option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3' - -config 'led' 'status_led_green' - option 'name' 'status' - option 'sysfs' 'tp-link:green:system' - option 'trigger' 'heartbeat' - -config 'led' 'status_led_blue' - option 'name' 'status' - option 'sysfs' 'tp-link:blue:system' - option 'trigger' 'heartbeat' - -config 'led' 'led_vpn_green' - option 'name' 'VPN' - option 'sysfs' 'tp-link:green:qss' - option 'trigger' 'netdev' - option 'dev' '${VPN_PROJECT}VPN' - option 'mode' 'link' - -config 'led' 'led_vpn_blue' - option 'name' 'VPN' - option 'sysfs' 'tp-link:blue:qss' - option 'trigger' 'netdev' - option 'dev' '${VPN_PROJECT}VPN' - option 'mode' 'link' - -# vim: noexpandtab \ No newline at end of file diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration new file mode 100644 index 0000000000000000000000000000000000000000..0e3658761a42d2aee46f6d639f8ee0eb23c315e1 --- /dev/null +++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration @@ -0,0 +1,21 @@ +#!/bin/sh + +UPGRADE_hostname=$(uci -q get "system.@system[0].hostname") +UPGRADE_description=$(uci -q get "system.@system[0].description") +UPGRADE_latitude=$(uci -q get "system.@system[0].latitude") +UPGRADE_longitude=$(uci -q get "system.@system[0].longitude") +UPGRADE_position_comment=$(uci -q get "system.@system[0].position_comment") +UPGRADE_contact=$(uci -q get "system.@system[0].contact") + +/bin/rm -rf /etc/config/system + +/bin/config_generate + +test -n "${UPGRADE_hostname}" && uci -q set "system.@system[0].hostname=${UPGRADE_hostname}" +test -n "${UPGRADE_description}" && uci -q set "system.@system[0].description=${UPGRADE_description}" +test -n "${UPGRADE_latitude}" && uci -q set "system.@system[0].latitude=${UPGRADE_latitude}" +test -n "${UPGRADE_longitude}" && uci -q set "system.@system[0].longitude=${UPGRADE_longitude}" +test -n "${UPGRADE_position_comment}" && uci -q set "system.@system[0].position_comment=${UPGRADE_position_comment}" +test -n "${UPGRADE_contact}" && uci -q set "system.@system[0].contact=${UPGRADE_contact}" + +uci -q commit system diff --git a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver index d2893cb35a8196d936bed9b5d02c794129b244f7..aa485ab5fbc93e91a10e78c105e362334bd6b131 100755 --- a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver +++ b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver @@ -4,3 +4,7 @@ . /etc/community.cfg setTimeserver "${NTPD_IP}" + +uci -q set "system.@system[0].timezone=CET-1CEST,M3.5.0,M10.5.0/3" + +uci -q commit system diff --git a/src/packages/fff/fff-timeserver/files/lib/functions/fff/timeserver b/src/packages/fff/fff-timeserver/files/lib/functions/fff/timeserver index fb69e71a9cce1d2039bd1eb86f30ae2c21e03728..d25b9be7126fd3d86471dc08070c5d14dfe9f4c5 100644 --- a/src/packages/fff/fff-timeserver/files/lib/functions/fff/timeserver +++ b/src/packages/fff/fff-timeserver/files/lib/functions/fff/timeserver @@ -12,6 +12,7 @@ setTimeserver() { local ntp=$1 uci batch <<-__EOF__ + delete system.ntp set system.ntp='timeserver' add_list system.ntp.server='$ntp' set system.ntp.enable_server='0'