From 0379474cbcbb99d1520ae35405affada9753cbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Behrmann?= Date: Fri, 27 Sep 2024 11:52:04 +0200 Subject: [PATCH] Add support for mkosi.clean.d and drop mkosi.configure.d It makes sense to have multiple clean scripts, but with configuration we expect a single output like with version and rootpw --- mkosi/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/config.py b/mkosi/config.py index 4ab7824a0..9613ced77 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -2024,7 +2024,6 @@ def parse_ini(path: Path, only_sections: Collection[str] = ()) -> Iterator[tuple section="Config", parse=config_make_list_parser(delimiter=",", parse=make_path_parser()), paths=("mkosi.configure",), - recursive_paths=("mkosi.configure.d/",), help="Configure script to run before doing anything", ), ConfigSetting( @@ -2254,6 +2253,7 @@ def parse_ini(path: Path, only_sections: Collection[str] = ()) -> Iterator[tuple section="Output", parse=config_make_list_parser(delimiter=",", parse=make_path_parser()), paths=("mkosi.clean",), + recursive_paths=("mkosi.clean.d",) help="Clean script to run after cleanup", ), # Content section