From bb478caa86b153b1fc5c1269c5cd87020c3a34e5 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 5 Mar 2024 19:42:18 +0100 Subject: [PATCH] mkosi: Use specifier to refer to the output directory Otherwise the output directory cannot be configured by users. --- mkosi.images/initrd/mkosi.conf | 4 ++-- mkosi.images/system/mkosi.conf | 4 ++-- mkosi.images/system/mkosi.conf.d/05-initrd.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf index 8e38dc1b782..36684c7f16f 100644 --- 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 9646bbefde0..5bcf6967c78 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 9f217540581..23685871c62 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 -- 2.47.3