summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-01-12 10:42:31 +0000
committerintrigeri <intrigeri@boum.org>2020-01-12 11:23:35 +0000
commit9eb4be6ff7df04ddcff2fc54ad89ddb16d25ad5c (patch)
tree9ad15feb70c4df098af9a43662397dcf16ff7a84 /config
parent8394e0467c765b6b39434312d541ce1dd4a08163 (diff)
Avoid 2 minutes delay while rebooting after applying an automatic upgrade (refs: #17026)
Otherwise, for some reason user@1000.service can't be stopped while rebooting after applying an upgrade until the default 2 minutes timeout is reached: A stop job is running for User Manager for UID 1000 (x / 2 min) I suspect that's because the Upgrader is running via sudo as another user, so the amnesia user's systemd instance is not allowed to kill it and as a result, the entire session is left in running state. OTOH this problem does not happen when the persistence setup wizard or the Unsafe Brower is left running before rebooting; that's perhaps because they don't run as systemd units.
Diffstat (limited to 'config')
-rw-r--r--config/chroot_local-includes/lib/systemd/system/user@1000.service.d/timeout.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/chroot_local-includes/lib/systemd/system/user@1000.service.d/timeout.conf b/config/chroot_local-includes/lib/systemd/system/user@1000.service.d/timeout.conf
new file mode 100644
index 0000000..6c95212
--- /dev/null
+++ b/config/chroot_local-includes/lib/systemd/system/user@1000.service.d/timeout.conf
@@ -0,0 +1,3 @@
+[Service]
+# Don't let the Upgrader block the reboot after applying an upgrade
+TimeoutStopSec=10