move deletion of machine id to finalize

Author: MagicalTux

scripts/base.sh

@@ -102,6 +102,7 @@ finalize() {
 	echo "** Generating disk image $1-$DATE"
 	echo '*****'
 	rm -f "$WORK/usr/sbin/policy-rc.d"
+	rm -f "$WORK/etc/machine-id" "$WORK/var/lib/dbus/machine-id" || true
 	echo localhost >"$WORK/etc/hostname"
 
 	# generate /etc/shells-release file

scripts/firstrun.sh

@@ -14,8 +14,7 @@ PATH="/usr/sbin:/sbin:/usr/bin:/bin"
 
 SYSTEM_UUID="$(cat /sys/class/dmi/id/product_uuid)"
 
-# force regen of machine-id
-rm -f /etc/machine-id /var/lib/dbus/machine-id || true
+# ensure machine-id exists
 /usr/bin/dbus-uuidgen --ensure
 
 # ensure ssh host keys if ssh is installed