From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 7 Jun 2023 11:37:11 +0000 (+0200)
Subject: arch: move workspace package manager configuration into a tree
X-Git-Tag: v15~120^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9b8dcdc0e3a9d1353abf0ae07f5fcff685b582c;p=thirdparty%2Fmkosi.git

arch: move workspace package manager configuration into a tree
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index b22fd04a7..409f0594d 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -37,7 +37,9 @@ class ArchInstaller(DistributionInstaller):
         # Create base layout for pacman and pacman-key
         state.root.joinpath("var/lib/pacman").mkdir(mode=0o755, exist_ok=True, parents=True)
 
-        pacman_conf = state.workspace / "pacman.conf"
+        pacman_conf = state.pkgmngr / "etc/pacman.conf"
+        pacman_conf.parent.mkdir(mode=0o755, exist_ok=True, parents=True)
+
         if state.config.repository_key_check:
             sig_level = "Required DatabaseOptional"
         else:
@@ -103,7 +105,7 @@ class ArchInstaller(DistributionInstaller):
 def invoke_pacman(state: MkosiState, packages: Sequence[str], apivfs: bool = True) -> None:
     cmdline: list[PathString] = [
         "pacman",
-        "--config", state.workspace / "pacman.conf",
+        "--config", state.pkgmngr / "etc/pacman.conf",
         "--noconfirm",
         "--needed",
         "-Sy", *sort_packages(packages),