From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 6 Sep 2023 11:57:58 +0000 (+0200)
Subject: Remove package manager generated hwdb from /etc
X-Git-Tag: v16~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4491985a8c13f855c0fdbb1ed6d6f917de9b204b;p=thirdparty%2Fmkosi.git

Remove package manager generated hwdb from /etc

We generate the hwdb in /usr, so remove any existing one that is
leftover in /etc.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 508f8e374..2b53d75df 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1513,6 +1513,9 @@ def run_hwdb(state: MkosiState) -> None:
     with complete_step("Generating hardware database"):
         run(["systemd-hwdb", "--root", state.root, "--usr", "--strict", "update"])
 
+    # Remove any existing hwdb in /etc in favor of the one we just put in /usr.
+    (state.root / "etc/udev/hwdb.bin").unlink(missing_ok=True)
+
 
 def run_firstboot(state: MkosiState) -> None:
     password, hashed = state.config.root_password or (None, False)