From 1d556e9e2a01e538ecddd8a2d8fb843391caf410 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 31 Jan 2024 10:45:13 +0100 Subject: [PATCH] test: use a dropin for the journald snippet The original way of appending to /etc/systemd/journald.conf doesn't work anymore, since we no longer ship the default configs in /etc/. --- test/TEST-24-CRYPTSETUP/test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh index a9c3e05d00..cfb746a4db 100755 --- a/test/TEST-24-CRYPTSETUP/test.sh +++ b/test/TEST-24-CRYPTSETUP/test.sh @@ -189,9 +189,10 @@ test_create_image() { /dev/mapper/$DM_NAME /var ext4 defaults 0 1 EOF - # Forward journal messages to the console, so we have something - # to investigate even if we fail to mount the encrypted /var - echo ForwardToConsole=yes >>"$initdir/etc/systemd/journald.conf" + # Forward journal messages to the console, so we have something to investigate even if we fail to mount + # the encrypted /var + mkdir "$initdir/etc/systemd/journald.conf.d/" + echo -ne "[Journal]\nForwardToConsole=yes\n" >"$initdir/etc/systemd/journald.conf.d/99-forward.conf" # If $INITRD wasn't provided explicitly, generate a custom one with dm-crypt # support