linux-initrd: Gracefully handle lack of “modules.builtin” file.
Fixes a regression introduced in
8f8ec56052
, whereby passing a “fake”
kernel package would no longer work.
Fixes <https://issues.guix.gnu.org/70239>.
* gnu/system/linux-initrd.scm (flat-linux-module-directory)[build-exp]:
Gracefully handle lack of “modules.builtin” file.
Reported-by: Tomas Volf <~@wolfsden.cz>
Change-Id: I3acf48123b20f0b6a3b9cc0bf22f76cec3e64361
master
parent
d33965908d
commit
9f1ef20114
|
@ -134,18 +134,23 @@ MODULES and taken from LINUX."
|
|||
(guix build utils)
|
||||
(rnrs io ports)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26))
|
||||
(srfi srfi-26)
|
||||
(ice-9 match))
|
||||
|
||||
(define module-dir
|
||||
(string-append #$linux "/lib/modules"))
|
||||
|
||||
(define builtin-modules
|
||||
(call-with-input-file
|
||||
(first (find-files module-dir "modules.builtin$"))
|
||||
(lambda (port)
|
||||
(map file-name->module-name
|
||||
(string-tokenize
|
||||
(get-string-all port))))))
|
||||
(match (find-files module-dir (lambda (file stat)
|
||||
(string=? (basename file)
|
||||
"modules.builtin")))
|
||||
((file . _)
|
||||
(call-with-input-file file
|
||||
(lambda (port)
|
||||
(map file-name->module-name
|
||||
(string-tokenize (get-string-all port))))))
|
||||
(_
|
||||
'())))
|
||||
|
||||
(define modules-to-lookup
|
||||
(lset-difference string=? '#$modules builtin-modules))
|
||||
|
|
Reference in New Issue