[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30604] [PATCH v4 7/7] linux-boot: Call make-static-device-nodes muc
From: |
Danny Milosavljevic |
Subject: |
[bug#30604] [PATCH v4 7/7] linux-boot: Call make-static-device-nodes much earlier. |
Date: |
Tue, 27 Feb 2018 12:26:19 +0100 |
* 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)
- [bug#30604] [PATCH v2 3/6] linux-initrd: Add kmod., (continued)
- [bug#30604] [PATCH v2 3/6] linux-initrd: Add kmod., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v3 0/6] Load Linux module only when supported hardware is present., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v3 1/6] gnu: kmod: Split off kmod-minimal., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v3 3/6] linux-initrd: Add kmod., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v3 5/6] vm: Allow qemu-image builder to load Linux kernel modules., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v3 2/6] gnu: Add kmod-minimal-static., Danny Milosavljevic, 2018/02/25
- [bug#30604] [PATCH v4 0/7] Load Linux module only when supported hardware is present., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 7/7] linux-boot: Call make-static-device-nodes much earlier.,
Danny Milosavljevic <=
- [bug#30604] [PATCH v4 5/7] vm: Allow qemu-image builder to load Linux kernel modules., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 2/7] gnu: Add kmod-minimal-static., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 6/7] vm: Make the virtio-blk uniquely identifyable in /sys., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 4/7] linux-boot: Load kernel modules only when the hardware is present., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 1/7] gnu: kmod: Split off kmod-minimal., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v4 3/7] linux-initrd: Add kmod., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v5 0/7] Load Linux module only when supported hardware is present., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v5 3/7] linux-initrd: Add kmod., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v5 1/7] gnu: kmod: Split off kmod-minimal., Danny Milosavljevic, 2018/02/27
- [bug#30604] [PATCH v5 4/7] linux-boot: Load kernel modules only when the hardware is present., Danny Milosavljevic, 2018/02/27