Merge "Ensure machine-id is not included in images"
This commit is contained in:
commit
c97cb559d3
@ -1,4 +1,4 @@
|
|||||||
dpkg
|
dpkg
|
||||||
modprobe
|
modprobe
|
||||||
pkg-map
|
pkg-map
|
||||||
|
sysprep
|
||||||
|
@ -9,3 +9,7 @@ set -o pipefail
|
|||||||
if [ -e /etc/machine-id ]; then
|
if [ -e /etc/machine-id ]; then
|
||||||
> /etc/machine-id
|
> /etc/machine-id
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -e /var/lib/dbus/machine-id ]; then
|
||||||
|
> /var/lib/dbus/machine-id
|
||||||
|
fi
|
||||||
|
11
releasenotes/notes/sysprep-fixes-8890b968a8fa7ac1.yaml
Normal file
11
releasenotes/notes/sysprep-fixes-8890b968a8fa7ac1.yaml
Normal 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.
|
Loading…
Reference in New Issue
Block a user