]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Make mkosi.repart/ append to the default value for RepartDirectories=
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 27 Oct 2023 12:22:09 +0000 (14:22 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 27 Oct 2023 17:54:58 +0000 (19:54 +0200)
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.

mkosi/config.py

index 739d206d02ea62fbf3ee60e72183341fc7ada971..b03719441596a02046930e4354d595bd9b972bff 100644 (file)
@@ -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(