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).

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index c1426e673bdf9281d37c47bb86fd1da1929ce8fa..d540a071a4850f2301f938e04f6209d9222b1ab3 100644 (file)
--- 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 454a03e98b25ab4a992d8001839ee987aafce88b..6ae0088048ff124f934c06e1e1eb8d8ae89a67d4 100644 (file)
--- 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 90fdc0cb48619e0c9ce24393db23a00826d9e10c..4f5cf412dfc3b4911903cff23ccaea4c9f1a805e 100644 (file)
--- 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 aeea839f8c4a86c9279296ba5050e8bd1d73de5e..bfb321f2bfea1ccc8a5c7203a1a3f65dcfdc9069 100644 (file)
--- 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]