summaryrefslogtreecommitdiffstats
path: root/mkosi.images/system
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-03-05 19:42:18 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-03-05 19:42:18 +0100
commitbb478caa86b153b1fc5c1269c5cd87020c3a34e5 (patch)
treebf7efd8e79e7e6381e58aa10856df2de151bba06 /mkosi.images/system
parentmkosi: Allow users to configure the build and cache directory (diff)
downloadsystemd-bb478caa86b153b1fc5c1269c5cd87020c3a34e5.tar.xz
systemd-bb478caa86b153b1fc5c1269c5cd87020c3a34e5.zip
mkosi: Use specifier to refer to the output directory
Otherwise the output directory cannot be configured by users.
Diffstat (limited to 'mkosi.images/system')
-rw-r--r--mkosi.images/system/mkosi.conf4
-rw-r--r--mkosi.images/system/mkosi.conf.d/05-initrd.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 9646bbefde..5bcf6967c7 100644
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -8,8 +8,8 @@ Dependencies=base
[Content]
Autologin=yes
-BaseTrees=../../mkosi.output/base
-ExtraTrees=../../mkosi.output/base-systemd
+BaseTrees=%O/base
+ExtraTrees=%O/base-systemd
Packages=
acl
bash-completion
diff --git a/mkosi.images/system/mkosi.conf.d/05-initrd.conf b/mkosi.images/system/mkosi.conf.d/05-initrd.conf
index 9f21754058..23685871c6 100644
--- a/mkosi.images/system/mkosi.conf.d/05-initrd.conf
+++ b/mkosi.images/system/mkosi.conf.d/05-initrd.conf
@@ -9,4 +9,4 @@ Format=|directory
Dependencies=initrd
[Content]
-Initrds=../../mkosi.output/initrd
+Initrds=%O/initrd