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.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 9816719e9b174ce327dd130f4a2eb47ba7cc594e..32dab1a7f3a99630e2472734125c6af7f96db9f7 100644 (file)
--- 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 2da8804a7ef0562c7b08a131fbe2f8d1494aac6c..45102ac7afd19331caaf851883430f1c066e461b 100644 (file)
--- 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