From 41b6486c9b24ef2582a74ae60eef9089ac8c7fb8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 9 Dec 2024 04:18:17 +0900 Subject: mkosi: move drop-in config for sanitizers --- mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf | 7 ------- .../usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf create mode 100644 mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf diff --git a/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf b/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf deleted file mode 100644 index ebf7899a78..0000000000 --- a/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/asan.conf +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# The iscsi-init.service calls `sh` which might, in certain circumstances, pull in instrumented systemd NSS -# modules causing `sh` to fail. Avoid the issue by setting LD_PRELOAD to load the sanitizer libraries if -# needed. -[Service] -EnvironmentFile=-/usr/lib/systemd/systemd-asan-env diff --git a/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf b/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf new file mode 100644 index 0000000000..ebf7899a78 --- /dev/null +++ b/mkosi.sanitizers/mkosi.extra/usr/lib/systemd/system/iscsi-init.service.d/10-asan.conf @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +# The iscsi-init.service calls `sh` which might, in certain circumstances, pull in instrumented systemd NSS +# modules causing `sh` to fail. Avoid the issue by setting LD_PRELOAD to load the sanitizer libraries if +# needed. +[Service] +EnvironmentFile=-/usr/lib/systemd/systemd-asan-env -- cgit v1.2.3