From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: bug#39671: Something appears to disable linux kernel modules from loading. Date: Thu, 20 Feb 2020 22:08:48 +0100 Message-ID: <87lfox2cgv.fsf@gnu.org> References: <86a75fqyn5.fsf@dismail.de> <87zhdel0wb.fsf@gnu.org> <20200220101826.y2esml7n2mumsnuz@pelzflorian.localdomain> <20200220121246.cerl2fivfguyzi7l@pelzflorian.localdomain> <20200220195925.3gpfvamxweucfhpf@pelzflorian.localdomain> <20200220203402.GA12513@jasmine.lan> <20200220204345.gfxbnegtxq4mppn7@pelzflorian.localdomain> <20200220205853.tpb6tf7wtdtjiotm@pelzflorian.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:45976) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4t59-0003Cr-VR for bug-guix@gnu.org; Thu, 20 Feb 2020 16:10:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4t58-0006YE-Na for bug-guix@gnu.org; Thu, 20 Feb 2020 16:10:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j4t58-0006Y4-KL for bug-guix@gnu.org; Thu, 20 Feb 2020 16:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j4t58-00053s-EW for bug-guix@gnu.org; Thu, 20 Feb 2020 16:10:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20200220205853.tpb6tf7wtdtjiotm@pelzflorian.localdomain> (pelzflorian@pelzflorian.de's message of "Thu, 20 Feb 2020 21:58:53 +0100") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: "pelzflorian (Florian Pelz)" Cc: 39671@debbugs.gnu.org, Joshua Branson --=-=-= Content-Type: text/plain pelzflorian (Florian Pelz) writes: Hi Florian, > On Thu, Feb 20, 2020 at 09:43:45PM +0100, pelzflorian (Florian Pelz) wrote: >> (I wonder why it does not apply; there were no changes to >> gnu/services/base.scm in a long time. Strange.) >> > > It did not apply for me either. Here it is in compressed form so its > encoding is not changed. It works for me; thank you! It did not apply -- I do not have this From 11509370049355680c815e06250afc09325c589c Mon Sep 17 00:00:00 2001 commit. Attached is the result of my manual application... janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-services-udev-Do-not-rely-on-shepherd-inheriting-env.patch Content-Transfer-Encoding: quoted-printable >From d057c431b707b26ce852d8ba692e9307248d0f63 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 20 Feb 2020 14:05:06 +0100 Subject: [PATCH] services: udev: Do not rely on shepherd inheriting environment variables. Fixes . * gnu/services/base.scm (udev-shepherd-service)[start] Move or copy environment variables to 'fork+exec-command' instead of 'setenv'. --- gnu/services/base.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 0c154d1c4e..706b3ae7ec 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 John Soo ;;; Copyright =C2=A9 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright =C2=A9 2020 Florian Pelz ;;; ;;; 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") =20 - ;; 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)) =20 - (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=3D" #$udev.c= onf) + (string-append "EUDEV_RULES_DIRECTORY=3D" + #$(file-append + rules "/lib/udev/rules.d")) + (string-append "LINUX_MODULE_DIRECTORY=3D" + (getenv "LINUX_MODULE_DIRECTOR= Y")) + (default-environment-variables))))) ;; Wait until udevd is up and running. This appears to ;; be needed so that the events triggered below are ;; actually handled. --=20 2.24.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--