mkosi: Use specifier to refer to the output directory

Otherwise the output directory cannot be configured by users.

diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf
index 8e38dc1b782068155a09eadc50c31a9daa3ef17c..36684c7f16f145fd4ed0aed06928e57147a8d80c 100644 (file)
--- 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=

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 9646bbefde048fa46fae109f0990e455028b5b1c..5bcf6967c78b74d2f7ba15e8d7c860cf3f4e6c3c 100644 (file)
--- 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 9f2175405816d16f364f330feba0487b473c9d27..23685871c62353a9b19bf41e3a0baa46dc2697d6 100644 (file)
--- 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