Improve machine-id management

Author: Florent Rivoire

skeleton-docker-based/usr/local/sbin/scw-builder-leave

@@ -49,3 +49,6 @@ rm -f /var/log/journal/*
 
 # Update locate cache
 updatedb 2>/dev/null || true
+
+# Remove machine-id (will be regenerated on first boot)
+rm -f /etc/machine-id /var/lib/dbus/machine-id

skeleton-systemd/usr/local/sbin/scw-gen-machine-id

@@ -4,7 +4,9 @@
 
 if [ -f /etc/.regen-machine-id ]
 then
+	rm -f /var/lib/dbus/machine-id
 	rm -f /etc/machine-id
+	dbus-uuidgen --ensure
 	systemd-machine-id-setup 2> /dev/null
 	rm -f /etc/.regen-machine-id
 fi