From: Daan De Meyer Date: Sun, 7 May 2023 09:29:28 +0000 (+0200) Subject: mkosi: Disable auditd in the preset instead of masking it X-Git-Tag: v254-rc1~509^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=949e1fdd5214bad52b4679a8ba1f3a98d5ce956e;p=thirdparty%2Fsystemd.git mkosi: Disable auditd in the preset instead of masking it --- diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index 6dc6443a857..a19d464a09a 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -22,7 +22,6 @@ KernelCommandLineExtra=systemd.crash_shell systemd.log_ratelimit_kmsg=0 systemd.journald.forward_to_console systemd.journald.max_level_console=warning - systemd.mask=auditd # Tell the kernel to only log warning and up to the console. loglevel=4 # Disable the kernel's ratelimiting on userspace logging to kmsg. diff --git a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset index fbc64f4b398..25eb76f4469 100644 --- a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset +++ b/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset @@ -23,3 +23,6 @@ enable systemd-networkd-wait-online.service # have dnf create its cache. disable dnf-makecache.timer disable dnf-makecache.service + +# We have journald to receive audit data so let's make sure we're not running auditd as well +disable auditd.service