From e2219740f3eea8aec03cda3f7516797aa52f6fa0 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 31 May 2024 10:23:58 +0200
Subject: [PATCH 1/2] mkosi: Drop two unnecessary settings in CI config

We don't build erofs images anymore and the firmware to use is set
per test so no need to configure it the CI config.
---
 .github/workflows/mkosi.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index c990a6acf0..9816719e9b 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -111,8 +111,6 @@ jobs:
 
         [Content]
         Environment=
-                # mkfs.erofs is extremely noisy when not connected to a tty.
-                SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet"
                 # Build debuginfo packages since we'll be publishing the packages as artifacts.
                 WITH_DEBUG=1
                 # Enabling optimizations significantly speeds up integration tests.
@@ -121,8 +119,6 @@ jobs:
         [Host]
         ToolsTree=default
         ToolsTreeDistribution=fedora
-        # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
-        QemuFirmware=uefi
         # We build with debuginfo so there's no point in mounting the sources into the machine.
         RuntimeBuildSources=no
         EOF

From 3a8e9b4a0e44b648ddb699dadf9d1509f1e54028 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 31 May 2024 10:25:08 +0200
Subject: [PATCH 2/2] mkosi: Unify device timeout for CI and local runs

Now that we use KVM and don't use repart anymore to create a root
partition on first boot, let's see if we can use the same device timeout
for both local and CI runs.
---
 .github/workflows/mkosi.yml | 9 ---------
 mkosi.conf                  | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 9816719e9b..32dab1a7f3 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -123,15 +123,6 @@ jobs:
         RuntimeBuildSources=no
         EOF
 
-        # These should override the options from mkosi.conf so we put them in a dropin that's ordered later
-        # instead.
-        tee mkosi.conf.d/99-ci.conf <<EOF
-        [Host]
-        KernelCommandLineExtra=
-                # Root device can take a long time to appear, so let's bump the timeout.
-                systemd.default_device_timeout_sec=180
-        EOF
-
     - name: Generate secure boot key
       run: mkosi --debug genkey
 
diff --git a/mkosi.conf b/mkosi.conf
index 2da8804a7e..45102ac7af 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -29,7 +29,7 @@ KernelCommandLine=systemd.crash_shell
                   rw
                   # Lower the default device timeout so we get a shell earlier if the root device does
                   # not appear for some reason.
-                  systemd.default_device_timeout_sec=20
+                  systemd.default_device_timeout_sec=30
                   # Make sure no LSMs are enabled by default.
                   apparmor=0
                   selinux=0