From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 27 Oct 2023 12:22:09 +0000 (+0200)
Subject: Make mkosi.repart/ append to the default value for RepartDirectories=
X-Git-Tag: v19~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20dc61e93eede28b1f6a1f4fdfbb90e7650442c;p=thirdparty%2Fmkosi.git

Make mkosi.repart/ append to the default value for RepartDirectories=

While for other list based settings that have a canonical path, we
generally want to append them all to the user provided values, for
RepartDirectories=, it probably makes more sense that if the user
specifies it explicitly, it overrides all the directories defined by
the project in mkosi.repart/ directories. Let's accomodate this by
having mkosi.repart/ modify the default value for RepartDirectories=
which is only used if the setting is not set explicitly.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 739d206d0..b03719441 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1259,7 +1259,6 @@ SETTINGS = (
         section="Output",
         parse=config_make_list_parser(delimiter=",", parse=make_path_parser()),
         paths=("mkosi.repart",),
-        path_default=False,
         help="Directory containing systemd-repart partition definitions",
     ),
     MkosiConfigSetting(