From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 30 May 2009 01:31:51 +0000 (+0000)
Subject: luci-0.8: merge r4729
X-Git-Tag: 0.8.7^0
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=aae312e759c74c576dad758d6716a87b52121828;ds=sidebyside

luci-0.8: merge r4729
---

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index 320694767..a16e282fe 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -324,6 +324,9 @@ function olsr.write(self, section, value)
 		uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
 	end)
 
+	-- Make sure that OLSR is enabled
+	sys.exec("/etc/init.d/olsrd enable")
+
 	uci:save("olsrd")
 	uci:save("dhcp")
 end
@@ -434,6 +437,9 @@ function client.write(self, section, value)
 	-- Register splash
 	uci:section("luci_splash", "iface", nil, {network=device.."dhcp", zone="freifunk"})
 	uci:save("luci_splash")
+	
+	-- Make sure that luci_splash is enabled
+	sys.exec("/etc/init.d/luci_splash enable")
 end
 
 return f