projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/meshwizard: Various fixes and cleanups
[project/luci.git]
/
contrib
/
package
/
meshwizard
/
files
/
usr
/
bin
/
meshwizard
/
helpers
/
initial_config.sh
diff --git
a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
index 12b9148ab27821f12609218dbe85914f81e4d5e4..6c442e0a96313af511e8e9f340d5b8b55f43bdb3 100755
(executable)
--- a/
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
+++ b/
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
@@
-2,12
+2,9
@@
# This is only run once (usually after flashing an image from the imagebuilder)
# It sets up the initial config for this node.
# This is only run once (usually after flashing an image from the imagebuilder)
# It sets up the initial config for this node.
-
. /etc/functions.sh
. $dir/functions.sh
. /etc/functions.sh
. $dir/functions.sh
-### System config
-
config_load system
# Rename system config
config_load system
# Rename system config
@@
-19,24
+16,18
@@
handle_system() {
config_foreach handle_system system
if [ -n "$(uci -q get meshwizard.community)" ]; then
config_foreach handle_system system
if [ -n "$(uci -q get meshwizard.community)" ]; then
- echo " + Setup community"
set_defaults "community_" freifunk.community
uci -q delete meshwizard.community
set_defaults "community_" freifunk.community
uci -q delete meshwizard.community
- uci_commitverbose freifunk
fi
fi
+[ -n "$profile_homepage" ] && uci set freifunk.community.homepage="$profile_homepage"
+uci_commitverbose "Setup community" freifunk
if [ -n "$(uci -q get meshwizard.contact)" ]; then
if [ -n "$(uci -q get meshwizard.contact)" ]; then
- echo " + Setup contact"
set_defaults "contact_" freifunk.contact
set_defaults "contact_" freifunk.contact
- uci -q delete meshwizard.contact && uci_commitverbose freifunk
+ uci -q delete meshwizard.contact && uci_commitverbose
"Setup contact"
freifunk
fi
if [ "$has_luci" == TRUE ]; then
fi
if [ "$has_luci" == TRUE ]; then
- echo " + Setup luci"
set_defaults "luci_main_" luci.main
set_defaults "luci_main_" luci.main
- uci -q delete meshwizard.luci_main && uci_commitverbose luci
+ uci -q delete meshwizard.luci_main && uci_commitverbose
"Setup luci"
luci
fi
fi
-
-uci commit
-
-