]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
arch: move workspace package manager configuration into a tree
authorJoerg Behrmann <behrmann@physik.fu-berlin.de>
Wed, 7 Jun 2023 11:37:11 +0000 (13:37 +0200)
committerJoerg Behrmann <behrmann@physik.fu-berlin.de>
Thu, 8 Jun 2023 13:03:58 +0000 (15:03 +0200)
mkosi/distributions/arch.py

index b22fd04a7176d3a6b97c886a022f6cbec3f4dbf2..409f0594dff0b703ed2eed5489ec0d702677006d 100644 (file)
@@ -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),