From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 15 Feb 2024 10:27:57 +0000 (+0100)
Subject: apt: Set Dir::Etc and Dir::Log to absolute paths as well
X-Git-Tag: v21~50^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c04ea244b6db2c62de3fbabd082763164adadc8;p=thirdparty%2Fmkosi.git

apt: Set Dir::Etc and Dir::Log to absolute paths as well

This allows "Dir" to be overridden which is needed in a later commit.
---

diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index 8e85e6618..9b159a1e6 100644
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -89,7 +89,7 @@ class Apt(PackageManager):
             config.write_text(
                 textwrap.dedent(
                     """\
-                    Dir::Etc "etc/apt";
+                    Dir::Etc "/etc/apt";
                     """
                 )
             )
@@ -130,6 +130,7 @@ class Apt(PackageManager):
             "-o", "APT::Sandbox::User=root",
             "-o", "Dir::Cache=/var/cache/apt",
             "-o", "Dir::State=/var/lib/apt",
+            "-o", "Dir::Log=/var/log/apt",
             "-o", f"Dir::State::Status={context.root / 'var/lib/dpkg/status'}",
             "-o", f"Dir::Log={context.workspace}",
             "-o", f"Dir::Bin::DPkg={find_binary('dpkg', root=context.config.tools())}",