projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3170786
)
contrib/meshwizard: Allow setting of luci_splash general values
author
Manuel Munz
<freifunk@somakoma.de>
Fri, 25 Nov 2011 16:18:43 +0000
(16:18 +0000)
committer
Manuel Munz
<freifunk@somakoma.de>
Fri, 25 Nov 2011 16:18:43 +0000
(16:18 +0000)
contrib/package/meshwizard/Makefile
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
patch
|
blob
|
history
diff --git
a/contrib/package/meshwizard/Makefile
b/contrib/package/meshwizard/Makefile
index ffb1911d541c547f176d6cc76ab73fc09507c4f5..8cebf170d24140f14ec0bd95df87cd8581705539 100644
(file)
--- a/
contrib/package/meshwizard/Makefile
+++ b/
contrib/package/meshwizard/Makefile
@@
-4,7
+4,7
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard
include $(TOPDIR)/rules.mk
PKG_NAME:=meshwizard
-PKG_RELEASE:=0.0.
5
+PKG_RELEASE:=0.0.
6
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
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 69fd48b92f187fddbacb216c12477430f99e5a27..f5b4943b8f687bd3c47df3a230a501df7af6e4b7 100755
(executable)
--- 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
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
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 95b765a5a0b982feec95008dbcb71dfacc0a1219..b6106de8768e1141167a32bb63c5b11f33ba23af 100755
(executable)
--- 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
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
dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange)
if [ "$(uci -q get meshwizard.netconfig.$net\_dhcp)" == 1 ] && [ -n "$dhcprange" ]; then