summaryrefslogtreecommitdiffstats
path: root/src/integritysetup
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-06-06 09:29:51 +0200
committerLuca Boccassi <luca.boccassi@gmail.com>2023-06-06 13:38:16 +0200
commita9b837aa34a2d0bff1687427c66bed3b74cf0fed (patch)
tree3ea6a15ad58fcdd583d1c62d7333f4874f68a8ff /src/integritysetup
parentMerge pull request #27933 from mrc0mmand/selinux (diff)
downloadsystemd-a9b837aa34a2d0bff1687427c66bed3b74cf0fed.tar.xz
systemd-a9b837aa34a2d0bff1687427c66bed3b74cf0fed.zip
generators: change TimeoutSec=0 to TimeoutSec=infinity
With these settings we intend to turn off timeouts for possibly interactive/slow commands. The officially documented way to turn off the time-outs is to setting them to infinity. So far we set them to zero here though. This lead to some confusiong, for example #18224. Let's fix this by uniformly spelling out TimeoutSec=infinity. This doesn't change behaviour. It just makes our generated files match what we document, without relying on historic compat support. Fixes: #18224
Diffstat (limited to 'src/integritysetup')
-rw-r--r--src/integritysetup/integritysetup-generator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c
index 15f508902d..5df6d81a84 100644
--- a/src/integritysetup/integritysetup-generator.c
+++ b/src/integritysetup/integritysetup-generator.c
@@ -100,7 +100,7 @@ static int create_disk(
"[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\n"
- "TimeoutSec=0\n"
+ "TimeoutSec=infinity\n"
"ExecStart=" ROOTLIBEXECDIR "/systemd-integritysetup attach '%s' '%s' '%s' '%s'\n"
"ExecStop=" ROOTLIBEXECDIR "/systemd-integritysetup detach '%s'\n",
name_escaped, device, empty_to_dash(key_file_escaped), empty_to_dash(options),