emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#40430: closed (Don’t attempt to create a module database when none a


From: GNU bug Tracking System
Subject: bug#40430: closed (Don’t attempt to create a module database when none are available)
Date: Sat, 04 Apr 2020 20:06:02 +0000

Your message dated Sat, 4 Apr 2020 22:05:49 +0200
with message-id <address@hidden>
and subject line Re: [bug#40430] Don’t attempt to create a module database when 
none are available
has caused the debbugs.gnu.org bug report #40430,
regarding Don’t attempt to create a module database when none are available
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
40430: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40430
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: Don’t attempt to create a module database when none are available Date: Sat, 04 Apr 2020 19:16:15 +0300
The present code breaks with a non-modular kernel. This can be easily avoided.

--- a/gnu/system.scm
+++ #<buffer system.scm>
@@ -477,13 +477,19 @@
 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)




--- End Message ---
--- Begin Message --- Subject: Re: [bug#40430] Don’t attempt to create a module database when none are available Date: Sat, 4 Apr 2020 22:05:49 +0200
Thanks!

Pushed to guix master as commit b2fff3b5de7d510fe4809e9a97089dddf2a39ffc.

Attachment: pgp8wTDbQ0yVW.pgp
Description: OpenPGP digital signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]