wb-set-mac: disable MAC setting for wb6 and newer (#29)

* wb-set-mac: disable MAC setting for wb6 and newer

debian/changelog

@@ -1,3 +1,9 @@
+wb-utils (3.1.0) stable; urgency=medium
+
+  * wb-set-mac: disable MAC setting for wb6 and newer
+
+ -- Nikita Maslov <[email protected]>  Mon, 13 Dec 2021 17:40:50 +0300
+
 wb-utils (3.0.0) stable; urgency=medium
 
   * switch all services to systemd (wb-init, wb-watch-update, wb-gsm-rtc)

utils/bin/wb-set-mac

@@ -1,28 +1,21 @@
 #!/bin/bash
+
+. /usr/lib/wb-utils/wb_env.sh
+wb_source "of"
+
 IFACE=${IFACE:-$1}
 [[ -n "$IFACE" ]] || {
 	echo "IFACE is unset"
 	exit 1
 }
 
-[[ -z "$WB_VERSION" ]] && . /usr/lib/wb-utils/wb_env.sh
-
 set_saved_mac() {
 	local saved_mac="/var/lib/wirenboard/${IFACE}_mac.conf"
 	[[ -e "$saved_mac" ]] && [[ -s "$saved_mac" ]] &&
 		ip link set "$IFACE" address "$(cat "$saved_mac")" || true
 }
 
-case "$WB_VERSION" in
-	"60" | "61" )
-		# If random MAC is used (i.e. not set in DT by U-Boot or manually
-		# configured), fallback to the usual way. Otherwise, do nothing.
-		addr_type=$(cat "/sys/class/net/$IFACE/addr_assign_type")
-		[[ "$addr_type" == 1 ]] && set_saved_mac || true
-		;;
-
-	*)
-		set_saved_mac
-		;;
-esac
-
+if of_machine_match "fsl,imx23" || of_machine_match "fsl,imx28" ; then
+	# set mac from saved location for Wiren Board 5 or older
+	set_saved_mac
+fi