Merge "Ensure machine-id is not included in images"

This commit is contained in:
Zuul 2019-10-25 04:28:28 +00:00 committed by Gerrit Code Review
commit c97cb559d3
3 changed files with 16 additions and 1 deletions

View File

@ -1,4 +1,4 @@
dpkg
modprobe
pkg-map
sysprep

View File

@ -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

View File

@ -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.