summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--contrib/package/luci-addons/Makefile1
-rw-r--r--contrib/package/luci-addons/dist/sbin/luci-reload9
-rw-r--r--libs/web/root/etc/config/luci27
3 files changed, 23 insertions, 14 deletions
diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index e19489058..91943b8da 100644
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -31,6 +31,7 @@ define Package/luci-addons/install
$(INSTALL_BIN) ./dist/usr/bin/run-parts $(1)/usr/bin
$(INSTALL_BIN) ./dist/sbin/luci-flash $(1)/sbin
+ $(INSTALL_BIN) ./dist/sbin/luci-reload $(1)/sbin
$(INSTALL_BIN) ./dist/etc/init.d/luci_fixtime $(1)/etc/init.d
$(INSTALL_BIN) ./dist/etc/init.d/luci_ethers $(1)/etc/init.d
diff --git a/contrib/package/luci-addons/dist/sbin/luci-reload b/contrib/package/luci-addons/dist/sbin/luci-reload
new file mode 100644
index 000000000..48b6778bc
--- /dev/null
+++ b/contrib/package/luci-addons/dist/sbin/luci-reload
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for i in $*
+do
+ [ -x /etc/init.d/$i ] && {
+ echo -n "Reloading $i... "
+ /etc/init.d/$i restart >/dev/null 2>&1 && echo "done." || echo "failed!"
+ }
+done \ No newline at end of file
diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index f12cdf0ba..76375eafe 100644
--- a/libs/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
@@ -19,20 +19,19 @@ config extern flash_keep
option firewall "/etc/firewall.user"
config event uci_oncommit
- option network "/etc/init.d/network restart; /etc/init.d/dnsmasq restart"
- option wireless "/etc/init.d/network restart"
- option olsr "/etc/init.d/olsrd restart"
- option dhcp "/etc/init.d/dnsmasq restart"
- option dropbear "/etc/init.d/dropbear restart"
- option httpd "/etc/init.d/httpd restart"
- option fstab "/etc/init.d/fstab restart"
- option qos "/etc/init.d/qos restart"
- option luci_fw "/etc/init.d/luci_fw restart"
- option luci_ethers "/etc/init.d/luci_ethers restart; /etc/init.d/dnsmasq restart"
- option luci_splash "/etc/init.d/luci_splash restart"
- option freifunk "/etc/init.d/luci_freifunk restart"
- option upnpd "/etc/init.d/miniupnpd enabled && /etc/init.d/miniupnpd restart || /etc/init.d/miniupnpd stop"
- option ntpclient "/etc/init.d/ntpclient restart"
+ option network "/sbin/luci-reload network firewall luci_fw dnsmasq"
+ option wireless "/sbin/luci-reload network firewall luci_fw dnsmasq"
+ option olsr "/sbin/luci-reload olsrd"
+ option dhcp "/sbin/luci-reload dnsmasq"
+ option dropbear "/sbin/luci-reload dropbear"
+ option httpd "/sbin/luci-reload httpd"
+ option fstab "/sbin/luci-reload fstab"
+ option qos "/sbin/luci-reload qos"
+ option luci_fw "/sbin/luci-reload luci_fw"
+ option luci_ethers "/sbin/luci-reload luci_ethers dnsmasq"
+ option luci_splash "/sbin/luci-reload luci_splash"
+ option upnpd "/etc/init.d/miniupnpd enabled && /sbin/luci-reload miniupnpd || /etc/init.d/miniupnpd stop"
+ option ntpclient "/sbin/luci-reload ntpclient"
config internal languages
option de "Deutsch"