[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: system: Don’t create a module database when no modules are availa
From: |
guix-commits |
Subject: |
01/02: system: Don’t create a module database when no modules are available. |
Date: |
Sat, 4 Apr 2020 16:02:34 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit b2fff3b5de7d510fe4809e9a97089dddf2a39ffc
Author: Ivan Kozlov <address@hidden>
AuthorDate: Sat Apr 4 19:16:15 2020 +0300
system: Don’t create a module database when no modules are available.
* gnu/system.scm (operating-system-directory-base-entries): Don't create
a module database when no modules are available.
Signed-off-by: Danny Milosavljevic <address@hidden>
---
gnu/system.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index d79ea23..fd456c6 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -477,13 +477,19 @@ OS."
value of the SYSTEM-SERVICE-TYPE service."
(let ((locale (operating-system-locale-directory os)))
(mlet* %store-monad ((kernel -> (operating-system-kernel os))
+ (kernel-modules (package-file kernel "lib/modules"))
(modules ->
(operating-system-kernel-loadable-modules os))
+ (has-modules? ->
+ (or (not (null? modules))
+ (file-exists? kernel-modules)))
(kernel
(profile-derivation
(packages->manifest
(cons kernel modules))
- #:hooks (list linux-module-database)))
+ #:hooks (if has-modules?
+ (list linux-module-database)
+ '())))
(initrd -> (operating-system-initrd-file os))
(params (operating-system-boot-parameters-file
os)))
(return `(("kernel" ,kernel)