diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-20 23:31:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-21 00:06:40 +0200 |
| commit | 71977a6c59460e029c91741c8b11f3a544a70486 (patch) | |
| tree | 0ac002cf14248ec1b980cd589b8e235b1291f746 | |
| parent | a322e9d16b227484ce04721fee0f99618cb1007e (diff) | |
| download | guix-71977a6c59460e029c91741c8b11f3a544a70486.tar guix-71977a6c59460e029c91741c8b11f3a544a70486.tar.gz | |
Revert "system: Don’t create a module database when no modules are available."
This reverts commit b2fff3b5de7d510fe4809e9a97089dddf2a39ffc.
Fixes <https://bugs.gnu.org/40713>.
Reported by pkill9 <pkill9@runbox.com>.
This commit is incorrect: its effect depends on whether KERNEL's build
output is already available in the store, it breaks with non-package
kernels as reported at <https://bugs.gnu.org/40713>, and the
LINUX-MODULE-DATABASE hook is required at all times since
5c79f238634c5adb6657f1b4b1bb4ddb8bb73ef1 removed the relevant bits from
the 'linux-libre' package.
| -rw-r--r-- | gnu/system.scm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index fd456c6206..d79ea23f98 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -477,19 +477,13 @@ 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 (if has-modules? - (list linux-module-database) - '()))) + #:hooks (list linux-module-database))) (initrd -> (operating-system-initrd-file os)) (params (operating-system-boot-parameters-file os))) (return `(("kernel" ,kernel) |