diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-10-04 14:22:35 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-10-09 20:36:57 +0200 |
| commit | 963157ca78429c51feb3103828d8cc94440956f3 (patch) | |
| tree | 0b7f3b31166970d2b488b7b29a042ce14d9de80a /mkosi.conf.d | |
| parent | mkosi: Update to latest (diff) | |
| download | systemd-963157ca78429c51feb3103828d8cc94440956f3.tar.xz systemd-963157ca78429c51feb3103828d8cc94440956f3.zip | |
mkosi: Fix sections for settings
Upstream we moved settings around a bit to different sections, let's
adapt to those changes in the systemd repo.
Diffstat (limited to 'mkosi.conf.d')
| -rw-r--r-- | mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf | 3 | ||||
| -rw-r--r-- | mkosi.conf.d/10-centos/mkosi.conf | 3 | ||||
| -rw-r--r-- | mkosi.conf.d/20-sanitizers.conf | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf index 0a388f3c08..137130e569 100644 --- a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf +++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf @@ -3,9 +3,6 @@ # libselinux does not work in the slightest with /usr-only images so don't install the packages if we're # building a /usr-only image. -[Match] -Profile=!particle - [Content] Packages= selinux-policy diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf index dd462efcee..d2178315a2 100644 --- a/mkosi.conf.d/10-centos/mkosi.conf +++ b/mkosi.conf.d/10-centos/mkosi.conf @@ -6,7 +6,7 @@ Distribution=centos [Distribution] Release=10 -[Content] +[Build] Environment= # CentOS doesn't support btrfs so we have to use something else. We'd prefer to use XFS here but it # fails to mount on duplicate filesystem UUIDs which happens when running tests in parallel so we use @@ -16,5 +16,6 @@ Environment= # mkfs.ext4 enabled it by default, so we disable it explicitly. SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file" +[Content] Packages= kernel-modules # For squashfs diff --git a/mkosi.conf.d/20-sanitizers.conf b/mkosi.conf.d/20-sanitizers.conf index 62d052360a..ecbb02ba61 100644 --- a/mkosi.conf.d/20-sanitizers.conf +++ b/mkosi.conf.d/20-sanitizers.conf @@ -4,13 +4,15 @@ Environment=SANITIZERS Environment=!SANITIZERS= -[Content] +[Build] # Set verify_asan_link_order=0 to prevent ASAN warnings when building the image and make sure the real ASAN # options are set when booting the image. # Set intercept_tls_get_addr=0 to work around leak sanitizer segmentation fault in test-dlopen-so on CentOS # Stream 9. # TODO: Drop intercept_tls_get_addr=0 when we remove CentOS Stream 9 builds. Environment=ASAN_OPTIONS=verify_asan_link_order=0:intercept_tls_get_addr=0 + +[Content] KernelCommandLine= ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1 systemd.setenv=ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1 @@ -19,5 +21,5 @@ KernelCommandLine= LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions systemd.setenv=LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions -[Config] +[Include] Include=%D/mkosi.sanitizers |