summary refs log tree commit diff
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2024-03-17 13:38:58 +0800
committerHilton Chain <hako@ultrarare.space>2024-03-27 22:23:38 +0800
commit7995816ec4c38e447a2dcbeb33243180709e177d (patch)
treec7cfad0acf30ad2248887ecfde745b51e956b73f
parent3feb8f7f0227729ea15bdc84957f5d2e8c6ed117 (diff)
downloadguix-7995816ec4c38e447a2dcbeb33243180709e177d.tar.gz
linux-modules: Ignore nonexistent module files on boot.
This is a follow-up to 8f8ec56052766aa5105d672b77ad9eaca5c1ab3c, which only
covers building initrd, while the booting code still tries to load nonexistent
files for builtin modules.

* gnu/build/linux-modules.scm (load-linux-modules-from-directory): Ignore
nonexistent module files.

Change-Id: I09ef207e82397e915e671c8464b92bcf90f03dcf
-rw-r--r--gnu/build/linux-modules.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 12cb9c4ba6..68c32ff873 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -383,9 +383,10 @@ needed."
     (module-name-lookup directory))
 
   (for-each (lambda (module)
-              (load-linux-module* (module-name->file-name module)
-                                  #:lookup-module module-name->file-name))
-            modules))
+              (when (file-exists? module)
+                (load-linux-module* module
+                                    #:lookup-module module-name->file-name)))
+            (map module-name->file-name modules)))
 
 
 ;;;