]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Drop /etc/makepkg.conf logic from pacman mounts
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 13 Apr 2024 11:35:27 +0000 (13:35 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sat, 13 Apr 2024 17:22:02 +0000 (19:22 +0200)
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.

mkosi/installer/pacman.py

index 9b68ce3851f499d053c2383de9de6f3bbeab7bb9..a945bf8228985ff6857aded6d68ebb4a4ec90d8c 100644 (file)
@@ -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