mkosi: Use specifier to refer to the output directory

Otherwise the output directory cannot be configured by users.
2026-03-06 15:02:31 -08:00 · 2024-03-05 19:42:18 +01:00
parent c00b17f6d3
commit bb478caa86
3 changed files with 5 additions and 5 deletions
--- a/mkosi.images/initrd/mkosi.conf
+++ b/mkosi.images/initrd/mkosi.conf
@@ -7,8 +7,8 @@ Dependencies=base
 Format=cpio

 [Content]
-BaseTrees=../../mkosi.output/base
-ExtraTrees=../../mkosi.output/base-systemd
+BaseTrees=%O/base
+ExtraTrees=%O/base-systemd
 MakeInitrd=yes
 Bootable=no
 BuildPackages=
--- 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
--- 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