From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqcTT-0000i1-AP for guix-patches@gnu.org; Tue, 27 Feb 2018 05:27:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqcTR-00039P-2n for guix-patches@gnu.org; Tue, 27 Feb 2018 05:27:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54726) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eqcTQ-00039D-Te for guix-patches@gnu.org; Tue, 27 Feb 2018 05:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eqcTQ-0003vd-Nc for guix-patches@gnu.org; Tue, 27 Feb 2018 05:27:04 -0500 Subject: [bug#30604] [PATCH v4 7/7] linux-boot: Call make-static-device-nodes much earlier. Resent-Message-ID: From: Danny Milosavljevic Date: Tue, 27 Feb 2018 12:26:19 +0100 Message-Id: <20180227112619.5071-8-dannym@scratchpost.org> In-Reply-To: <20180227112619.5071-1-dannym@scratchpost.org> References: <20180226040609.3066-1-dannym@scratchpost.org> <20180227112619.5071-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30604@debbugs.gnu.org * gnu/system/linux-initrd.scm (expression->initrd): Store data files for make-static-device-nodes. * gnu/build/linux-boot.scm (make-static-device-nodes): Unexport. (boot-system): Call make-static-device-nodes. Delete lookup-module. * gnu/services/base.scm (udev-shepherd-service): Delete make-static-device-nodes call. --- gnu/build/linux-boot.scm | 14 +++++++++----- gnu/services/base.scm | 11 ----------- gnu/system/linux-initrd.scm | 3 ++- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 6d00ea9be..f0ac755f8 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -39,7 +39,6 @@ find-long-option find-long-options make-essential-device-nodes - make-static-device-nodes configure-qemu-networking device-number @@ -469,10 +468,6 @@ upon error." mounts) "ext4")) - (define (lookup-module name) - (string-append linux-module-directory "/" - (ensure-dot-ko name))) - (define (load-kernel-modules) "Examine /sys/devices to find out which modules to load and load them." (define enter? @@ -512,6 +507,15 @@ upon error." (when (member "--repl" args) (start-repl)) + (let* ((kernel-release + (utsname:release (uname))) + (directory + (string-append linux-module-directory "/lib/modules/" + kernel-release)) + (old-umask (umask #o022))) + (make-static-device-nodes directory) + (umask old-umask)) + (load-kernel-modules) (when qemu-guest-networking? diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 69e211ffa..0cba1c66f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1857,17 +1857,6 @@ item of @var{packages}." (setenv "EUDEV_RULES_DIRECTORY" #$(file-append rules "/lib/udev/rules.d")) - (let* ((kernel-release - (utsname:release (uname))) - (linux-module-directory - (getenv "LINUX_MODULE_DIRECTORY")) - (directory - (string-append linux-module-directory "/" - kernel-release)) - (old-umask (umask #o022))) - (make-static-device-nodes directory) - (umask old-umask)) - (let ((pid (primitive-fork))) (case pid ((0)