Merge remote-tracking branch 'origin/devel' into agnau-ssid-hack

Needs corresponding MR in feed/targets as well.

Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

map-controller/files/etc/config/mapcontroller

@@ -38,7 +38,7 @@ config sta_steering
 
 config ap
 	option band '2'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option ssid '$DEFAULT_SSID'
 	option encryption 'sae-mixed'
 	option key '$WIFI_FH_KEY'
 	option vid '1'
@@ -47,7 +47,7 @@ config ap
 
 config ap
 	option band '5'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option ssid '$DEFAULT_SSID'
 	option encryption 'sae-mixed'
 	option key '$WIFI_FH_KEY'
 	option vid '1'
@@ -56,7 +56,7 @@ config ap
 
 config ap
 	option band '6'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option ssid '$DEFAULT_SSID'
 	option encryption 'sae'
 	option key '$WIFI_FH_KEY'
 	option vid '1'

map-controller/files/etc/uci-defaults/99-mapcntlr

@@ -1,17 +1,24 @@
 #!/bin/sh
 
 . /etc/device_info
+. /lib/functions/system.sh
 
 WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
 WIFI_BH_KEY=${WIFI_BH_KEY::-1}
 
 BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
 [ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
+load-rip
+DEFAULT_SSID="$(cd /data/tch_conv && ./display_mac.sh | grep SSID | head -n1 | sed -E 's/^.+ SSID: (.*)$/\1/' | tr a-z A-Z)"
+if [ -z "$DEFAULT_SSID" ]; then
+	DEFAULT_SSID="${DEVICE_MANUFACTURER}-${BASEMAC_ADDR}"
+fi
 
 WIFI_FH_KEY="$(db get hw.board.wpa_key)"
 WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"
 
 sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/g" \
+	-e "s/\$DEFAULT_SSID/$DEFAULT_SSID/g" \
 	-e "s/\$WIFI_FH_KEY/$WIFI_FH_KEY/g" \
 	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
 	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \