From 75698b0febc822049afb04858777de15dc01b93e Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Tue, 8 Jun 2021 11:51:12 -0500
Subject: [PATCH] Clearing machine-id requires also removing the info from
 /var/lib/bus/

---
 raspi_master.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/raspi_master.yaml b/raspi_master.yaml
index 7198b88..a4e8f8b 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -151,8 +151,9 @@ steps:
       rm "${ROOT?}/etc/resolv.conf"
     root-fs: /
 
-  # Clear /etc/machine-id, it should be auto-generated upon first
-  # boot. From the manpage (machine-id(5)):
+  # Clear /etc/machine-id and /var/lib/bus/machine-id, as both should
+  # be auto-generated upon first boot. From the manpage
+  # (machine-id(5)):
   #
   #   For normal operating system installations, where a custom image is
   #   created for a specific machine, /etc/machine-id should be
@@ -161,4 +162,4 @@ steps:
   # Note this will also trigger ConditionFirstBoot=yes for systemd.
   - chroot: /
     shell: |
-      rm -f /etc/machine-id
+      rm -f /etc/machine-id /var/lib/bus/machine-id