Merge branch 'testing' of ssh://qmp.cat:221/qmp into testing

packages/qmp-system/files/etc/init.d/qmp_autoconf

@@ -17,6 +17,10 @@
 #
 #    The full GNU General Public License is included in this distribution in
 #    the file called "COPYING".
+#
+# Contributors:
+#	Simó Albert i Beltran
+#
 
 START=99
 STOP=99
@@ -100,6 +104,10 @@ configure() {
 	#Reloading network to avoid problems with next functions
 	log Reloading network
 	/etc/init.d/network reload
+	if /etc/init.d/gwck enabled
+	then
+		/etc/init.d/gwck restart
+	fi
 	
 	#Configuring networking
 	log "[Configuring networking]"

packages/qmp-system/files/etc/qmp/bmx6health.sh

@@ -28,6 +28,10 @@
 		echo "[$(date)] There is no interface working, restarting network and bmx6."
 		logread > /tmp/bmx6_crash_$(date +%Y%m%d_%H%M).log
 		/etc/init.d/network restart
+		if /etc/init.d/gwck enabled
+		then
+			/etc/init.d/gwck restart
+		fi
 		/etc/init.d/bmx6 restart
 	}
 }

packages/qmp-system/files/etc/qmp/qmp_control.sh

@@ -55,6 +55,10 @@ configure_wifi() {
 	qmp_configure_wifi_initial
 	qmp_configure_wifi
 	/etc/init.d/network reload
+	if /etc/init.d/gwck enabled
+	then
+		/etc/init.d/gwck restart
+	fi
 }
 
 apply_netserver() {
@@ -66,6 +70,10 @@ configure_network() {
 	[ -f "/etc/init.d/olsrd" ] && /etc/init.d/olsrd restart
 	bmx6 -c --configReload || /etc/init.d/bmx6 restart
 	/etc/init.d/network reload
+	if /etc/init.d/gwck enabled
+	then
+		/etc/init.d/gwck restart
+	fi
 	/etc/init.d/dnsmasq restart
 	apply_netserver
 	qmp_restart_firewall

packages/qmp-system/files/etc/qmp/qmplua/network.lua

@@ -19,6 +19,10 @@
 
     The full GNU General Public License is included in this distribution in
     the file called "COPYING".
+
+ Contributors:
+	Simó Albert i Beltran
+
 --]]
 
 
@@ -113,7 +117,7 @@ end
 
 --! @brief Restart the network daemon
 function network.restart_daemon()
-	os.execute('/etc/init.d/network restart')
+	os.execute('/etc/init.d/network restart; /etc/init.d/gwck enabled && /etc/init.d/gwck restart')
 end
 
 return network

packages/qmp-system/files/usr/lib/lua/luci/model/cbi/qmp/wireless.lua

@@ -17,6 +17,10 @@
 
     The full GNU General Public License is included in this distribution in
     the file called "COPYING".
+
+ Contributors:
+	Simó Albert i Beltran
+
 --]]
 
 require("luci.sys")
@@ -117,7 +121,7 @@ end
 
 function m.on_commit(self,map)
 	http.redirect("/luci-static/resources/qmp/wait_short.html")
-	luci.sys.call('(/etc/qmp/qmp_control.sh configure_wifi ; /etc/init.d/network reload)&')
+	luci.sys.call('(/etc/qmp/qmp_control.sh configure_wifi ; /etc/init.d/network reload; /etc/init.d/gwck enabled && /etc/init.d/gwck restart)&')
 end