From 5e640516655a3fa0241a108069fa7ddd4e560624 Mon Sep 17 00:00:00 2001
From: David Shea <dshea@redhat.com>
Date: Fri, 5 Oct 2018 14:27:28 -0400
Subject: [PATCH] Replace /etc/machine-id with an empty file

Since these images can be used to create multiple machines, they should
not have a unique machine-id attached to them. Replace /etc/machine-id
with an empty file so that it will be regenerated at boot time.

(cherry picked from commit 6fab72d894cd0c59ff798502d5c30f814f1a4948)

Related: rhbz#1656105
---
 share/composer/ami.ks              | 4 ++++
 share/composer/ext4-filesystem.ks  | 4 ++++
 share/composer/partitioned-disk.ks | 4 ++++
 share/composer/qcow2.ks            | 4 ++++
 share/composer/tar.ks              | 4 ++++
 share/composer/vhd.ks              | 4 ++++
 share/composer/vmdk.ks             | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/share/composer/ami.ks b/share/composer/ami.ks
index e8e216e8..724567ac 100644
--- a/share/composer/ami.ks
+++ b/share/composer/ami.ks
@@ -33,6 +33,10 @@ services --enabled=sshd,chronyd,cloud-init
 # Remove random-seed
 rm /var/lib/systemd/random-seed
 
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
+
 # tell cloud-init to create the ec2-user account
 sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
 %end
diff --git a/share/composer/ext4-filesystem.ks b/share/composer/ext4-filesystem.ks
index 9dd460c4..74a5d95a 100644
--- a/share/composer/ext4-filesystem.ks
+++ b/share/composer/ext4-filesystem.ks
@@ -24,6 +24,10 @@ bootloader --location=none
 %post
 # Remove random-seed
 rm /var/lib/systemd/random-seed
+
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
 %end
 
 %packages --nobase
diff --git a/share/composer/partitioned-disk.ks b/share/composer/partitioned-disk.ks
index 46922259..6008d313 100644
--- a/share/composer/partitioned-disk.ks
+++ b/share/composer/partitioned-disk.ks
@@ -26,6 +26,10 @@ zerombr
 %post
 # Remove random-seed
 rm /var/lib/systemd/random-seed
+
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
 %end
 
 %packages
diff --git a/share/composer/qcow2.ks b/share/composer/qcow2.ks
index f638ad0b..3f569149 100644
--- a/share/composer/qcow2.ks
+++ b/share/composer/qcow2.ks
@@ -26,6 +26,10 @@ zerombr
 %post
 # Remove random-seed
 rm /var/lib/systemd/random-seed
+
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
 %end
 
 %packages
diff --git a/share/composer/tar.ks b/share/composer/tar.ks
index cb304fbc..2fcf5901 100644
--- a/share/composer/tar.ks
+++ b/share/composer/tar.ks
@@ -24,6 +24,10 @@ bootloader --location=none
 %post
 # Remove random-seed
 rm /var/lib/systemd/random-seed
+
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
 %end
 
 # NOTE Do NOT add any other sections after %packages
diff --git a/share/composer/vhd.ks b/share/composer/vhd.ks
index 22fa30e3..57a0b347 100644
--- a/share/composer/vhd.ks
+++ b/share/composer/vhd.ks
@@ -31,6 +31,10 @@ services --enabled=sshd,chronyd,waagent
 # Remove random-seed
 rm /var/lib/systemd/random-seed
 
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
+
 # This file is required by waagent in RHEL, but compatible with NetworkManager
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE=eth0
diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks
index 6dab5277..b6f8ddac 100644
--- a/share/composer/vmdk.ks
+++ b/share/composer/vmdk.ks
@@ -27,6 +27,10 @@ services --enabled=sshd,chronyd,vmtoolsd
 %post
 # Remove random-seed
 rm /var/lib/systemd/random-seed
+
+# Clear /etc/machine-id
+rm /etc/machine-id
+touch /etc/machine-id
 %end
 
 %packages