diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2011-11-25 16:18:43 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2011-11-25 16:18:43 +0000 |
| commit | c0a776877858ee5354b7acd73d84dccfda0a9513 (patch) | |
| tree | 561a6410e45b70f17f3da668584d55caa88988ea /contrib/package/meshwizard | |
| parent | 3170786db4c92203657bf8028c4ca8c99ec1556e (diff) | |
contrib/meshwizard: Allow setting of luci_splash general values
Diffstat (limited to 'contrib/package/meshwizard')
3 files changed, 5 insertions, 2 deletions
diff --git a/contrib/package/meshwizard/Makefile b/contrib/package/meshwizard/Makefile index ffb1911d54..8cebf170d2 100644 --- a/contrib/package/meshwizard/Makefile +++ b/contrib/package/meshwizard/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meshwizard -PKG_RELEASE:=0.0.5 +PKG_RELEASE:=0.0.6 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh index 69fd48b92f..f5b4943b8f 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh @@ -15,7 +15,7 @@ for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_ done # now read all values from the selected community profile, will override some values from the defaults before -for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults profile zone_freifunk include; do +for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults profile zone_freifunk include luci_splash; do get_var profile_$community.$v done diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh index 95b765a5a0..b6106de876 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh @@ -11,6 +11,9 @@ if [ ! "$has_luci_splash" == TRUE ]; then exit fi +set_defaults "luci_splash_" luci_splash.general +uci_commitverbose "Setup general splash settings" luci_splash + dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange) if [ "$(uci -q get meshwizard.netconfig.$net\_dhcp)" == 1 ] && [ -n "$dhcprange" ]; then |