From 16ae4285332ea098e472fbbfdd6a2a3144844643 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 12 Mar 2024 16:12:06 +0000 Subject: [PATCH] ci: Streamline logging Let's have journald forward to the console and disable systemd's status output which contain ANSI escape sequences that aren't rendered in logs. --- .github/workflows/ci.yml | 7 +++++++ .../lib/systemd/system/mkosi-check-and-shutdown.service | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 846c1fa8af..e662a6bf71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,6 +146,13 @@ jobs: [Content] KernelCommandLine=systemd.default_device_timeout_sec=180 + # Status uses ansi escape sequences which are useless in log files. + systemd.show_status=false + # Make sure we get logs via the journal instead. + systemd.journald.forward_to_console + # Disable systemd's and the kernel's ratelimiting on userspace logging to kmsg. + systemd.log_ratelimit_kmsg=0 + printk.devkmsg=on Environment=SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet" [Host] diff --git a/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service b/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service index 74b209e98e..33058f2864 100644 --- a/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service +++ b/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service @@ -10,5 +10,3 @@ SuccessActionExitStatus=123 [Service] Type=oneshot ExecStart=/usr/lib/systemd/mkosi-check-and-shutdown.sh -StandardOutput=journal+console -StandardError=journal+console