guix
/
guix
mirror of git://git.savannah.gnu.org/guix.git
3
4
Fork 0
Code Issues Releases Wiki Activity

services: udev: Do not rely on shepherd inheriting environment variables. 

Fixes <https://bugs.gnu.org/39671>.

* gnu/services/base.scm (udev-shepherd-service)[start] Move or copy
environment variables to 'fork+exec-command' instead of 'setenv'.
This commit is contained in:
Florian Pelz 2020-02-20 14:05:06 +01:00
parent bb90beb5bf
commit 00500449b0
No known key found for this signature in database
GPG Key ID: 300888CB39C63817
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/services/base.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2037,11 +2038,6 @@ item of @var{packages}."
(setenv "LINUX_MODULE_DIRECTORY"
"/run/booted-system/kernel/lib/modules")
;; The first one is for udev, the second one for eudev.
(setenv "UDEV_CONFIG_FILE" #$udev.conf)
(setenv "EUDEV_RULES_DIRECTORY"
#$(file-append rules "/lib/udev/rules.d"))
(let* ((kernel-release
(utsname:release (uname)))
(linux-module-directory
@ -2058,7 +2054,18 @@ item of @var{packages}."
(make-static-device-nodes directory))
(umask old-umask))
(let ((pid (fork+exec-command (list udevd))))
(let ((pid (fork+exec-command (list udevd)
#:environment-variables
(cons*
;; The first one is for udev, the second one for
;; eudev.
(string-append "UDEV_CONFIG_FILE=" #$udev.conf)
(string-append "EUDEV_RULES_DIRECTORY="
#$(file-append
rules "/lib/udev/rules.d"))
(string-append "LINUX_MODULE_DIRECTORY="
(getenv "LINUX_MODULE_DIRECTORY"))
(default-environment-variables)))))
;; Wait until udevd is up and running. This appears to
;; be needed so that the events triggered below are
;; actually handled.