diff --git a/diskimage_builder/elements/debootstrap/element-deps b/diskimage_builder/elements/debootstrap/element-deps index a65556089..0f701cad1 100644 --- a/diskimage_builder/elements/debootstrap/element-deps +++ b/diskimage_builder/elements/debootstrap/element-deps @@ -1,4 +1,4 @@ dpkg modprobe pkg-map - +sysprep diff --git a/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id b/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id index e3e4aac18..f9557fe83 100755 --- a/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id +++ b/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id @@ -9,3 +9,7 @@ set -o pipefail if [ -e /etc/machine-id ]; then > /etc/machine-id fi + +if [ -e /var/lib/dbus/machine-id ]; then + > /var/lib/dbus/machine-id +fi diff --git a/releasenotes/notes/sysprep-fixes-8890b968a8fa7ac1.yaml b/releasenotes/notes/sysprep-fixes-8890b968a8fa7ac1.yaml new file mode 100644 index 000000000..68c16e749 --- /dev/null +++ b/releasenotes/notes/sysprep-fixes-8890b968a8fa7ac1.yaml @@ -0,0 +1,11 @@ +--- +fixes: + - | + The sysprep element has been fixed to truncate ``/var/lib/dpkg/machine-id`` + (``/etc/machine-id`` was already being truncated). This ensures a + machine-id is not packaged in the image and systemd will be forced to + generate a new one upon first boot. + - | + The sysprep element is added as a dependency to the ``debootstrap`` element to + ensure that it runs on all Debian builds, including debian-minimal based + images.