diff --git a/diskimage_builder/elements/debian/element-deps b/diskimage_builder/elements/debian/element-deps index 1c0ebe248..25a740d8a 100644 --- a/diskimage_builder/elements/debian/element-deps +++ b/diskimage_builder/elements/debian/element-deps @@ -1,2 +1,3 @@ debian-minimal openssh-server +sysprep diff --git a/diskimage_builder/elements/opensuse-minimal/element-deps b/diskimage_builder/elements/opensuse-minimal/element-deps index ac6b190dd..799449c22 100644 --- a/diskimage_builder/elements/opensuse-minimal/element-deps +++ b/diskimage_builder/elements/opensuse-minimal/element-deps @@ -1 +1,2 @@ +sysprep zypper-minimal diff --git a/diskimage_builder/elements/opensuse/element-deps b/diskimage_builder/elements/opensuse/element-deps index 89baf7316..955c38b1b 100644 --- a/diskimage_builder/elements/opensuse/element-deps +++ b/diskimage_builder/elements/opensuse/element-deps @@ -1,3 +1,4 @@ cache-url package-installs +sysprep zypper diff --git a/diskimage_builder/elements/redhat-common/element-deps b/diskimage_builder/elements/redhat-common/element-deps index 7076aba94..5cef2a44c 100644 --- a/diskimage_builder/elements/redhat-common/element-deps +++ b/diskimage_builder/elements/redhat-common/element-deps @@ -1 +1,2 @@ package-installs +sysprep diff --git a/diskimage_builder/elements/sysprep/README.rst b/diskimage_builder/elements/sysprep/README.rst new file mode 100644 index 000000000..cb9c15aa3 --- /dev/null +++ b/diskimage_builder/elements/sysprep/README.rst @@ -0,0 +1,5 @@ +sysprep +======= + +This element holds configuration and scripts that are common for all +distributions. diff --git a/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id b/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id new file mode 100755 index 000000000..e3e4aac18 --- /dev/null +++ b/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +if [ -e /etc/machine-id ]; then + > /etc/machine-id +fi diff --git a/diskimage_builder/elements/ubuntu-common/element-deps b/diskimage_builder/elements/ubuntu-common/element-deps new file mode 100644 index 000000000..467f171ad --- /dev/null +++ b/diskimage_builder/elements/ubuntu-common/element-deps @@ -0,0 +1 @@ +sysprep diff --git a/releasenotes/notes/sysprep-f3fd036bc1d2c405.yaml b/releasenotes/notes/sysprep-f3fd036bc1d2c405.yaml new file mode 100644 index 000000000..2a9696898 --- /dev/null +++ b/releasenotes/notes/sysprep-f3fd036bc1d2c405.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Adds sysprep element included by all systemd distros +fixes: + - | + Adds default sysprep element clearing /etc/machine-id which + prevents duplicated /etc/machine-id by forcing systemd to + generate a new id for each booted system.