From 71977a6c59460e029c91741c8b11f3a544a70486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 20 Apr 2020 23:31:01 +0200 Subject: =?UTF-8?q?Revert=20"system:=20Don=E2=80=99t=20create=20a=20module?= =?UTF-8?q?=20database=20when=20no=20modules=20are=20available."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b2fff3b5de7d510fe4809e9a97089dddf2a39ffc. Fixes . Reported by pkill9 . 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 , and the LINUX-MODULE-DATABASE hook is required at all times since 5c79f238634c5adb6657f1b4b1bb4ddb8bb73ef1 removed the relevant bits from the 'linux-libre' package. --- gnu/system.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') 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) -- cgit v1.2.3