X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=5c4bd6569f0ca7131281ea70fd58b8f7b57ae6a2;hp=01312502601d57057f32d36b3b5c688a7f335fa8;hb=708281b81177f3a32d11770126727737a6a69483;hpb=ab016c45a96bad3fe799ce5d680dbecf3878470b diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 013125026..5c4bd6569 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -605,11 +605,12 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - TimeoutStartSec= from + DefaultTimeoutStartSec= from the manager configuration file, except when Type=oneshot is used, in which case the timeout - is disabled by default. + is disabled by default + (see systemd-systemd.conf5). @@ -628,8 +629,9 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} time span value such as "5min 20s". Pass 0 to disable the timeout logic. Defaults to - TimeoutStartSec= from the - manager configuration file. + DefaultTimeoutStopSec= from the + manager configuration file + (see systemd-systemd.conf5).