diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-05-24 15:39:28 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-05-24 15:39:28 +0000 |
| commit | 25b16be6cf05ff2e5b04a2297b8f01f4d0051518 (patch) | |
| tree | 48c4a7abd02ebf9f441dcf5383d51c22be631b8b | |
| parent | e4821d7a10ee2096b689a66baa9b974d51339bc3 (diff) | |
| download | s6-rc-25b16be6cf05ff2e5b04a2297b8f01f4d0051518.tar.xz | |
Increase s6-sudo (for oneshots) timeouts from 2 to 30 seconds
| -rw-r--r-- | src/s6-rc/s6-rc-compile.c | 2 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c index fc3d790..93c8713 100644 --- a/src/s6-rc/s6-rc-compile.c +++ b/src/s6-rc/s6-rc-compile.c @@ -945,7 +945,7 @@ static inline void write_oneshot_runner (char const *compiled, uid_t const *uids S6_EXTBINPREFIX "s6-ipcserver-socketbinder -- s\n" S6_EXTBINPREFIX "s6-ipcserverd -1 --\n" S6_EXTBINPREFIX "s6-ipcserver-access -v0 -E -l0 -i data/rules --\n" - S6_EXTBINPREFIX "s6-sudod -t 2000 --\n" + S6_EXTBINPREFIX "s6-sudod -t 30000 --\n" S6RC_EXTLIBEXECPREFIX "s6-rc-oneshot-run -l ../.. ") || (blocking && !stralloc_cats(&satmp, "-b ")) || !stralloc_cats(&satmp, "--\n")) dienomem() ; diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c index 615cbf8..a80ae91 100644 --- a/src/s6-rc/s6-rc.c +++ b/src/s6-rc/s6-rc.c @@ -107,7 +107,7 @@ static pid_t start_oneshot (unsigned int i, int h) newargv[m++] = S6_EXTBINPREFIX "s6-sudo" ; newargv[m++] = verbosity >= 3 ? "-vel0" : "-el0" ; newargv[m++] = "-t" ; - newargv[m++] = "2000" ; + newargv[m++] = "30000" ; newargv[m++] = "-T" ; newargv[m++] = tfmt ; newargv[m++] = "--" ; |