From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 13 Apr 2024 11:35:27 +0000 (+0200)
Subject: Drop /etc/makepkg.conf logic from pacman mounts
X-Git-Tag: v23~4^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ccd78037e1504bc9f99d7b3d6b8c4eb047ec776;p=thirdparty%2Fmkosi.git

Drop /etc/makepkg.conf logic from pacman mounts

makepkg is always invoked in the image itself to build a package,
so there's no point in mounting over the makepkg.conf from the tools
tree into the sandbox.
---

diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index 9b68ce385..a945bf822 100644
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -59,12 +59,6 @@ class Pacman(PackageManager):
             # bind mount the local directory from the image to make sure that happens.
             mounts += [Mount(context.root / "var/lib/pacman/local", "/var/lib/pacman/local")]
 
-        if (
-            (context.config.tools() / "etc/makepkg.conf").exists() and
-            not (context.pkgmngr / "etc/makepkg.conf").exists()
-        ):
-            mounts += [Mount(context.config.tools() / "etc/makepkg.conf", "/etc/makepkg.conf", ro=True)]
-
         return mounts
 
     @classmethod