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 6dc6443a857c78297cbb645a2a44bd7924d1fa6b..a19d464a09aa6d710fbe49a840e29f8ce05d95e9 100644 (file)
--- 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 fbc64f4b398f7b41b8f40c5815f800b027eff6f6..25eb76f4469727742e3dd0381e6270931a8f6525 100644 (file)
--- 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