Merge remote-tracking branch 'origin/v2_3' into dev/v2_3/improved_err…

…or_logging
Project-CETI · Dec 9, 2024 · 89c4646 · 89c4646
2 parents 142f8e9 + 9072e77
commit 89c4646
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/overlay/usr/lib/raspberrypi-sys-mods/firstboot b/overlay/usr/lib/raspberrypi-sys-mods/firstboot
@@ -173,7 +173,8 @@ do_resize() {
 
 sethostname() {
 	if [ -z "$DEVICE_ID" ]; then
-		DEVICE_ID="$(</proc/cpuinfo grep Serial | sed s/'.*:\s0*'/''/)"
+		# Grab last 8 characters of serial number
+		DEVICE_ID="$(</proc/cpuinfo grep Serial | sed s/'.*\(.\{8\}$\)'/'\1'/)"
 	fi
 
 	# If we still have no UID, just give up
@@ -183,7 +184,7 @@ sethostname() {
 	fi
 
 	# Set device is as the hostname
-	DEVICE_ID=$(printf "wt-%08x" $((16#$DEVICE_ID)))
+	DEVICE_ID="wt-$DEVICE_ID"
 	HOSTNAME="$(hostname)"
 
 	if [ "$HOSTNAME" != "$DEVICE_ID" ]; then