summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPatrick Grimm <patrick@lunatiki.de>2014-07-30 21:20:52 +0000
committerPatrick Grimm <patrick@lunatiki.de>2014-07-30 21:20:52 +0000
commit21b9548361e10df47b4e69fd614eb33271f08584 (patch)
treec41feda8579041b912a7a5dcb4af37dd9c9f64cd
parentb2b58f1cea2da4089e1ca366219cd048a826e690 (diff)
meshwizard: add option addchannelbefore
-rw-r--r--contrib/package/community-profiles/files/etc/config/profile_berlin3
-rwxr-xr-xcontrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin
index debfd1f0ad..78c148a328 100644
--- a/contrib/package/community-profiles/files/etc/config/profile_berlin
+++ b/contrib/package/community-profiles/files/etc/config/profile_berlin
@@ -1,7 +1,8 @@
config 'community' 'profile'
option 'name' 'Freifunk Berlin'
option 'homepage' 'http://berlin.freifunk.net'
- option 'ssid' 'berlin.freifunk.net'
+ option 'ssid' 'freifunk.net'
+ option 'ssid_scheme' 'addchannelbefore'
option 'mesh_network' '104.0.0.0/8'
option 'splash_network' '10.104.0.0/16'
option 'splash_prefix' '27'
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
index 3d28e3956c..7366fe6ea4 100755
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
@@ -65,6 +65,8 @@ bssid="$($dir/helpers/gen_bssid.sh $channel $community)"
ssid="$profile_ssid"
if [ "$profile_ssid_scheme" == "addchannel" ]; then
ssid="$ssid - ch$channel"
+else if [ "$profile_ssid_scheme" == "addchannelbefore" ]; then
+ ssid="ch$channel.$ssid"
fi
uci batch << EOF