From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 17 Sep 2009 11:12:45 +0000 (+0000)
Subject: luci-0.9: merge r5334
X-Git-Tag: 0.9.0~124
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=aa4f626aabb8c969df1744869bc6bd61e574eb60;p=project%2Fluci.git

luci-0.9: merge r5334
---

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 1ab7239c86..11f1ad60bc 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
+}