Browse Source

services: shepherd: Spawn services with nothing but the PATH variable.

Previously, services spawned with 'make-forkexec-constructor' &
co. would all inherit the environment variables of PID 1, which includes
things like 'BOOT_IMAGE'.  This change resets it to the bare minimum.

* gnu/services/shepherd.scm (shepherd-configuration-file): Add call to
'default-environment-variables'.  Remove 'setenv' call.
gn-latest-20200428
Ludovic Courtès 1 year ago
parent
commit
8b9cad01e9
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      gnu/services/shepherd.scm

+ 7
- 5
gnu/services/shepherd.scm View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Carlo Zancanaro <carlo@zancanaro.id.au>
;;;
@@ -281,6 +281,12 @@ and return the resulting '.go' file."
(use-modules (srfi srfi-34)
(system repl error-handling))

;; Specify the default environment visible to all the services.
;; Without this statement, all the environment variables of PID 1
;; are inherited by child services.
(default-environment-variables
'("PATH=/run/current-system/profile/bin"))

;; Arrange to spawn a REPL if something goes wrong. This is better
;; than a kernel panic.
(call-with-error-handling
@@ -288,10 +294,6 @@ and return the resulting '.go' file."
(apply register-services
(map load-compiled '#$(map scm->go files)))))

;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around
;; it.
(setenv "PATH" "/run/current-system/profile/bin")

(format #t "starting services...~%")
(for-each (lambda (service)
;; In the Shepherd 0.3 the 'start' method can raise


Loading…
Cancel
Save