[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: services: shepherd: Spawn services with nothing but the PATH vari
From: |
guix-commits |
Subject: |
03/03: services: shepherd: Spawn services with nothing but the PATH variable. |
Date: |
Sun, 16 Feb 2020 17:31:21 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 8b9cad01e9619f53dc5a65892ca6a09ca5de3447
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sun Feb 16 23:28:54 2020 +0100
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.
---
gnu/services/shepherd.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 08bb330..d483ff1 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;; Copyright © 2018 Carlo Zancanaro <address@hidden>
;;;
@@ -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