meshwizard: add option addchannelbefore

diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin
index debfd1f0ada107c0ee971b8aefcad437e47dfc81..78c148a328f5fb987d02b14de166f7523fc68d74 100644 (file)
--- 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 3d28e3956c9b21c03c7bb305f3a3097dc15e4315..7366fe6ea4181cf1cc2be8bfd240f3fc2744a4c6 100755 (executable)
--- 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