Merge "Clear /etc/machine-id to avoid duplicate machine-ids"

2017-11-30 01:56:26 +00:00 · 2017-11-30 01:56:26 +00:00 · 247c68b5a3
commit 247c68b5a3
parent d01d3d8832 6c2b1465cc
8 changed files with 30 additions and 0 deletions
--- a/diskimage_builder/elements/debian/element-deps
+++ b/diskimage_builder/elements/debian/element-deps
@ -1,2 +1,3 @@
 debian-minimal
 openssh-server
+sysprep
--- a/diskimage_builder/elements/opensuse-minimal/element-deps
+++ b/diskimage_builder/elements/opensuse-minimal/element-deps
@ -1 +1,2 @@
+sysprep
 zypper-minimal
--- a/diskimage_builder/elements/opensuse/element-deps
+++ b/diskimage_builder/elements/opensuse/element-deps
@ -1,3 +1,4 @@
 cache-url
 package-installs
+sysprep
 zypper
--- a/diskimage_builder/elements/redhat-common/element-deps
+++ b/diskimage_builder/elements/redhat-common/element-deps
@ -1 +1,2 @@
 package-installs
+sysprep
--- a/diskimage_builder/elements/sysprep/README.rst
+++ b/diskimage_builder/elements/sysprep/README.rst
@ -0,0 +1,5 @@
+sysprep
+=======
+
+This element holds configuration and scripts that are common for all
+distributions.
--- a/diskimage_builder/elements/sysprep/finalise.d/01-clear-machine-id
+++ 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
--- a/diskimage_builder/elements/ubuntu-common/element-deps
+++ b/diskimage_builder/elements/ubuntu-common/element-deps
@ -0,0 +1 @@
+sysprep
--- a/releasenotes/notes/sysprep-f3fd036bc1d2c405.yaml
+++ 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.