From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 22 Aug 2023 19:26:14 +0000 (+0200)
Subject: Make sure we remove /var/lib/dbus/machine-id from the image
X-Git-Tag: v16~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22726958c196e2db027f1e7a772c86a76e0ed562;p=thirdparty%2Fmkosi.git

Make sure we remove /var/lib/dbus/machine-id from the image

Fixes #1818
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 7dff5aae2..be92c96c7 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -157,7 +157,10 @@ def install_distribution(state: MkosiState) -> None:
             if state.config.packages:
                 state.config.distribution.install_packages(state, state.config.packages)
 
-    for f in ("var/lib/systemd/random-seed", "var/lib/systemd/credential.secret", "etc/machine-info"):
+    for f in ("var/lib/systemd/random-seed",
+              "var/lib/systemd/credential.secret",
+              "etc/machine-info",
+              "var/lib/dbus/machine-id"):
         # Using missing_ok=True still causes an OSError if the mount is read-only even if the
         # file doesn't exist so do an explicit exists() check first.
         if (state.root / f).exists():