From 20345a86b7157e229c1c7e3976005548bad159a4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 8 Jul 2024 12:59:52 +0200 Subject: mkosi: Adapt configuration to take into account configuration rework In https://github.com/systemd/mkosi/pull/2847, the '@' specifier is removed, CLI arguments take priority over configuration files again and the "main" image is defined at the top level instead of in mkosi.images/. Additionally, not every setting from the top level configuration is inherited by the images in mkosi.images/ anymore, only settings which make sense to be inherited are inherited. This commit gets rid of all the usages of '@', moves the "main" image configuration from mkosi.images/system to the top level and gets rid of various hacks we had in place to deal with quirks of the old configuration parsing logic. We also remove usages of Images= and --append as these options are removed by the mentioned PR. --- docs/HACKING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/HACKING.md b/docs/HACKING.md index e05f029d90..5b1e355327 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -52,7 +52,7 @@ image all the time when iterating on a patch, add the following to ```conf [Host] -@RuntimeBuildSources=yes +RuntimeBuildSources=yes ``` After enabling this setting, the source and build directories will be mounted to -- cgit v1.2.3