diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
| commit | bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f (patch) | |
| tree | 09fe91a8351471e5e7a821cb28521dd9b9d7e357 /gnu/services | |
| parent | a4f1a7e2db22cd028fb514846c2791928b8734d3 (diff) | |
| parent | b44e19acd1a0d449427cea0333f02ac98605be1c (diff) | |
| download | guix-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar guix-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/linux.scm | 1 | ||||
| -rw-r--r-- | gnu/services/shepherd.scm | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm index 781a61973c..12934c2084 100644 --- a/gnu/services/linux.scm +++ b/gnu/services/linux.scm @@ -142,7 +142,6 @@ representation." (documentation "Load kernel modules.") (provision '(kernel-module-loader)) (requirement '(file-systems)) - (respawn? #f) (one-shot? #t) (modules `((srfi srfi-1) (srfi srfi-34) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index bad089844d..9906ae43c4 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -291,6 +291,13 @@ and return the resulting '.go' file." (default-environment-variables '("PATH=/run/current-system/profile/bin")) + ;; Booting off a DVD, especially on a slow machine, can make + ;; 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) + ;; Arrange to spawn a REPL if something goes wrong. This is better ;; than a kernel panic. (call-with-error-handling |