mkosi: Use default timeout of 10s

Let's override the default timeout to something more reasonable for
mkosi builds.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 57b19d462eaee255ca2af0b99efc0889d6f2115b..aa56ab303c2cf3f980518f2e7ab9e90fcf8d39b7 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -91,6 +91,7 @@ jobs:
 
         [Content]
         Environment=CI_BUILD=1
+                    DEFAULT_TIMEOUT_SEC=90
 
         [Output]
         KernelCommandLine=${{ env.KERNEL_CMDLINE }}

diff --git a/mkosi.build b/mkosi.build
index 33b864e211d314d4c6805e60206ad6ebf6ce1aaa..24114af4ecf4c42543bb5355a0e6b35982fbab4d 100755 (executable)
--- a/mkosi.build
+++ b/mkosi.build
@@ -63,6 +63,8 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
             ${PAMDIR:-} \
             -D "sysvinit-path=$sysvinit_path" \
             -D "rootprefix=$rootprefix" \
+            -D default-timeout-sec=${DEFAULT_TIMEOUT_SEC:-10} \
+            -D default-user-timeout-sec=${DEFAULT_TIMEOUT_SEC:-10} \
             -D man=false \
             -D translations=false \
             -D version-tag="${VERSION_TAG}" \