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

This commit is contained in:
Zuul 2017-11-30 01:56:26 +00:00 committed by Gerrit Code Review
commit 247c68b5a3
8 changed files with 30 additions and 0 deletions

View File

@ -1,2 +1,3 @@
debian-minimal debian-minimal
openssh-server openssh-server
sysprep

View File

@ -1 +1,2 @@
sysprep
zypper-minimal zypper-minimal

View File

@ -1,3 +1,4 @@
cache-url cache-url
package-installs package-installs
sysprep
zypper zypper

View File

@ -1 +1,2 @@
package-installs package-installs
sysprep

View File

@ -0,0 +1,5 @@
sysprep
=======
This element holds configuration and scripts that are common for all
distributions.

View File

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

View File

@ -0,0 +1 @@
sysprep

View File

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