[PATCH v4 15/15] bsp/default: remove/update etc/config/system
Jan Kraus
mayosemmel at googlemail.com
Sa Feb 18 11:46:27 CET 2017
Wenn du das Ticket im Mantis dazu auf machst, als Featurewunsch, darfst
du gern ein
Reviewed-by: Jan Kraus <mayosemmel at gmail.com>
von mir dranpappen.
Grüße Jan
Am Samstag, den 18.02.2017, 11:37 +0100 schrieb Tim Niemeyer:
> Hi
>
> Am 18. Februar 2017 11:32:22 MEZ schrieb Jan Kraus <mayosemmel at googlemail.com>:
> >Hi Tim,
> >
> >habe ich richtig verstanden, das die LEDs jetzt nicht mehr die VPN
> >Aktivität anzeigen?
>
> Ja
>
> >Falls ja, gibt es einen Plan, wie wir das zukünftig wieder hinkriegen?
>
> Nein. :(
>
> Ich weiss auch nicht, ob wir das wirklich haben wollen, weil es Geräte spezifisch is.
>
> Ich würde vorschlagen das ins Mantis zu werfen, aber ich würde das eher ungern umsetzen wollen.
>
> Tim
>
> >Grüße Jan
> >
> >Am Freitag, den 17.02.2017, 08:07 +0100 schrieb Tim Niemeyer:
> >> - This will fix the LEDs on LEDE
> >> - We will lose the power heartbeat trigger on the LED
> >> - We will lose the VPN signaling on the LEDs
> >>
> >> While remove the default system config, the LEDE system now
> >> configures wrong ntp service. We fix this by deleting these
> >> entries in the fff-timeserver package.
> >>
> >> If the file is already present on the devices, we need to upgrade it.
> >> Therefore the 05-config-system-migration is now part of the
> >fff-sysupgrade
> >> package.
> >>
> >> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> >> ---
> >>
> >> Changes in v4:
> >> - Set default value for the timezone
> >> - Do not set empty values
> >> - Commit changes at the end
> >>
> >> Changes in v3: None
> >> Changes in v2:
> >> - New patch
> >>
> >> bsp/default/root_file_system/etc/config/system.tpl | 29
> >----------------------
> >> .../etc/uci-defaults/05-config-system-migration | 21
> >++++++++++++++++
> >> .../files/etc/uci-defaults/51-fff-timeserver | 4 +++
> >> .../files/lib/functions/fff/timeserver | 1 +
> >> 4 files changed, 26 insertions(+), 29 deletions(-)
> >> delete mode 100644
> >bsp/default/root_file_system/etc/config/system.tpl
> >> create mode 100644
> >src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/05-config-system-migration
> >>
> >> 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 47e1a74..0000000
> >> --- 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 0000000..0e36587
> >> --- /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. at system[0].hostname")
> >> +UPGRADE_description=$(uci -q get "system. at system[0].description")
> >> +UPGRADE_latitude=$(uci -q get "system. at system[0].latitude")
> >> +UPGRADE_longitude=$(uci -q get "system. at system[0].longitude")
> >> +UPGRADE_position_comment=$(uci -q get
> >"system. at system[0].position_comment")
> >> +UPGRADE_contact=$(uci -q get "system. at system[0].contact")
> >> +
> >> +/bin/rm -rf /etc/config/system
> >> +
> >> +/bin/config_generate
> >> +
> >> +test -n "${UPGRADE_hostname}" && uci -q set
> >"system. at system[0].hostname=${UPGRADE_hostname}"
> >> +test -n "${UPGRADE_description}" && uci -q set
> >"system. at system[0].description=${UPGRADE_description}"
> >> +test -n "${UPGRADE_latitude}" && uci -q set
> >"system. at system[0].latitude=${UPGRADE_latitude}"
> >> +test -n "${UPGRADE_longitude}" && uci -q set
> >"system. at system[0].longitude=${UPGRADE_longitude}"
> >> +test -n "${UPGRADE_position_comment}" && uci -q set
> >"system. at system[0].position_comment=${UPGRADE_position_comment}"
> >> +test -n "${UPGRADE_contact}" && uci -q set
> >"system. at 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 d2893cb..aa485ab 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. at 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 fb69e71..d25b9be 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'
> >> --
> >> 2.1.4
> >>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 473 bytes
Beschreibung: This is a digitally signed message part
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20170218/2af317cf/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev