diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/services/shepherd.scm | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'gnu/services/shepherd.scm')
| -rw-r--r-- | gnu/services/shepherd.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index e99458da43..2f30c6c907 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -297,8 +297,7 @@ and return the resulting '.go' file." ;; everything slow. Thus, increase the timeout compared to the ;; default 5s in the Shepherd 0.7.0. See ;; <https://bugs.gnu.org/40572>. - ;; XXX: Use something better when the next Shepherd is out. - (set! (@@ (shepherd service) %pid-file-timeout) 30) + (default-pid-file-timeout 30) ;; Arrange to spawn a REPL if something goes wrong. This is better ;; than a kernel panic. |