From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 16 Mar 2023 11:12:38 +0000 (+0100)
Subject: mkosi: Use default timeout of 10s
X-Git-Tag: v254-rc1~1001
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f94d2741f7259bfb89a4165f035f79683acec3b;p=thirdparty%2Fsystemd.git

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 57b19d462ea..aa56ab303c2 100644
--- 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 33b864e211d..24114af4ecf 100755
--- 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}" \