Browse Source

Revert "system: Don’t create a module database when no modules are available."

This reverts commit b2fff3b5de.

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
5c79f23863 removed the relevant bits from
the 'linux-libre' package.
gn-latest-20200428
Ludovic Courtès 2 years ago
parent
commit
71977a6c59
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 8
      gnu/system.scm

8
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)

Loading…
Cancel
Save