From 8eb738326c7e2d38eed8ca99792dceb96887ec64 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 17 Sep 2009 11:12:01 +0000 Subject: [PATCH] modules/freifunk: migrate /etc/config/freifunk to the new format if it was restored by sysupgrade --- modules/freifunk/root/etc/rc.local.d/01-config-migration | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/freifunk/root/etc/rc.local.d/01-config-migration b/modules/freifunk/root/etc/rc.local.d/01-config-migration index 1ab7239c8..11f1ad60b 100644 --- a/modules/freifunk/root/etc/rc.local.d/01-config-migration +++ b/modules/freifunk/root/etc/rc.local.d/01-config-migration @@ -6,7 +6,7 @@ _log() { } _uci() { - uci get "$1" 2>/dev/null + uci ${2:+-c $2} get "$1" 2>/dev/null } @@ -39,3 +39,13 @@ done uci commit olsrd /etc/init.d/olsrd restart } + + +# Ensure that the community definitions are in the +# new format + +[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \ +[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && { + _log "Converting freifunk configuration to new format" + cp /rom/etc/config/freifunk /etc/config/freifunk +} -- 2.11.0