From 3405b84d8c4c145e2d034bfe954da728daf2d589 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jun 2025 18:21:11 +0200 Subject: [PATCH] units: systems might take a while to boot vmspawn systems might take quite a while to boot in particular if they go through uefi and wait for a network lease. Hence let's increase the start timeout to 2min (from 45s). We'll do that for both nspawn and vmspawn, even though the UEFI thing certainly doesn't apply there (but the DHCP thing still does). --- units/systemd-nspawn@.service.in | 1 + units/systemd-vmspawn@.service.in | 1 + units/user/systemd-nspawn@.service.in | 1 + units/user/systemd-vmspawn@.service.in | 1 + 4 files changed, 4 insertions(+) diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in index c1426e673b..d540a071a4 100644 --- a/units/systemd-nspawn@.service.in +++ b/units/systemd-nspawn@.service.in @@ -29,6 +29,7 @@ Delegate=yes DelegateSubgroup=supervisor CoredumpReceive=yes TasksMax=16384 +TimeoutSec=2min {{SERVICE_WATCHDOG}} {# Enforce a strict device policy, similar to the one nspawn configures (in diff --git a/units/systemd-vmspawn@.service.in b/units/systemd-vmspawn@.service.in index 454a03e98b..6ae0088048 100644 --- a/units/systemd-vmspawn@.service.in +++ b/units/systemd-vmspawn@.service.in @@ -21,6 +21,7 @@ ExecStart=systemd-vmspawn --quiet --register=yes --keep-unit --network-tap --mac KillMode=mixed Type=notify Slice=machine.slice +TimeoutSec=2min {{SERVICE_WATCHDOG}} {# Enforce a strict device policy. Make sure to keep these policies in sync if you change them! #} diff --git a/units/user/systemd-nspawn@.service.in b/units/user/systemd-nspawn@.service.in index 90fdc0cb48..4f5cf412df 100644 --- a/units/user/systemd-nspawn@.service.in +++ b/units/user/systemd-nspawn@.service.in @@ -25,6 +25,7 @@ Delegate=yes DelegateSubgroup=supervisor CoredumpReceive=yes TasksMax=16384 +TimeoutSec=2min {{SERVICE_WATCHDOG}} [Install] diff --git a/units/user/systemd-vmspawn@.service.in b/units/user/systemd-vmspawn@.service.in index aeea839f8c..bfb321f2bf 100644 --- a/units/user/systemd-vmspawn@.service.in +++ b/units/user/systemd-vmspawn@.service.in @@ -18,6 +18,7 @@ ExecStart=systemd-vmspawn --quiet --keep-unit --register=yes --network-tap --mac KillMode=mixed Type=notify Slice=machine.slice +TimeoutSec=2min {{SERVICE_WATCHDOG}} [Install]