luci-0.11: merge r9571 - r9622

[project/luci.git] / contrib / package / meshwizard / files / usr / bin / meshwizard / helpers / gen_bssid.sh

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
index c9be99786fc0c355dfb4544cde72bb10f59ef4a4..efe101fad00907d5733b4a913edf7cc2387f1e06 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
@@ -5,15 +5,17 @@
 channel=$1
 community=$2
 
-. /etc/functions.sh
+. /lib/functions.sh
 
 
 # Try to get BSSID from profile first
 config_load profile_$community
 config_get bssid bssidscheme $channel
-config_get bssid_all bssidscheme "all"
+if [ -z "$bssid" ]; then
+       config_get bssid bssidscheme "all"
+fi
 
-if [ -z "$bssid" ] && [ -z "$bssid_all" ]; then
+if [ -z "$bssid" ]; then
        case $channel in
        [1-9])
                bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE"
@@ -22,10 +24,10 @@ if [ -z "$bssid" ] && [ -z "$bssid_all" ]; then
                bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE"
                ;;
        [3-9][0-9])
-               bssid="00:$channel:CA:FF:EE:EE"
+               bssid="02:$channel:CA:FF:EE:EE"
                ;;
        1[0-9][0-9])
-               bssid="${channel/1/01:}:CA:FF:EE:EE"
+               bssid="${channel/1/12:}:CA:FF:EE:EE"
                ;;
        *)      bssid="02:CA:FF:EE:BA:BE"
                ;;