diff options
| author | Luca Boccassi <bluca@debian.org> | 2024-12-04 11:09:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 11:09:37 +0100 |
| commit | 0a7fda3b455f3fc285006bc563755d7e0fb05912 (patch) | |
| tree | d7495397ada8d03dcfbc01a1cbb03d47bb6b8d50 | |
| parent | po: Translated using Weblate (Slovenian) (diff) | |
| parent | mkosi: disable Fedora specific drop-in config when running with sanitizers (diff) | |
| download | systemd-0a7fda3b455f3fc285006bc563755d7e0fb05912.tar.xz systemd-0a7fda3b455f3fc285006bc563755d7e0fb05912.zip | |
mkosi: disable Fedora specific drop-in config when running with sanitizers (#35460)
Hopefully fixes #35335.
3 files changed, 9 insertions, 6 deletions
diff --git a/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf b/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf deleted file mode 100644 index 28dbdb29a2..0000000000 --- a/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Manager] -# Sanitizers may make exit() extremely slower. -# Let's extend the timeout. See issue #35335. -DefaultTimeoutStopSec=2min diff --git a/mkosi.sanitizers/mkosi.extra/etc/systemd/system/service.d/10-timeout-abort.conf b/mkosi.sanitizers/mkosi.extra/etc/systemd/system/service.d/10-timeout-abort.conf new file mode 100644 index 0000000000..a28779997b --- /dev/null +++ b/mkosi.sanitizers/mkosi.extra/etc/systemd/system/service.d/10-timeout-abort.conf @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This is for disabling Fedora specific drop-in config, +# which contains following lines: +# +# [Service] +# TimeoutStopFailureMode=abort diff --git a/test/TEST-73-LOCALE/meson.build b/test/TEST-73-LOCALE/meson.build index 4f50d66e55..e5b9f19015 100644 --- a/test/TEST-73-LOCALE/meson.build +++ b/test/TEST-73-LOCALE/meson.build @@ -4,5 +4,7 @@ integration_tests += [ integration_test_template + { 'name' : fs.name(meson.current_source_dir()), 'priority' : 10, + # TODO: Remove when https://github.com/systemd/systemd/issues/35335 is fixed. + 'coredump-exclude-regex' : '/systemd-localed', }, ] |