diff mbox series

[bug#69841] linux-modules: Ignore nonexistent module files on boot.

Message ID 219ed2009b2279a16d4fc4ca9bf773f73d7d07cd.1710662827.git.hako@ultrarare.space
State New
Headers show
Series [bug#69841] linux-modules: Ignore nonexistent module files on boot. | expand

Commit Message

Hilton Chain March 17, 2024, 8:52 a.m. UTC 
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
---

 gnu/build/linux-modules.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


base-commit: 5267c6073c3bdc6ba7874fc776c23c928f1ee263
--
2.41.0

Comments

Hilton Chain March 27, 2024, 2:43 p.m. UTC | #1 
Applied as 7995816ec4c38e447a2dcbeb33243180709e177d, closing.
diff mbox series

Patch

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 @@  (define (load-linux-modules-from-directory modules directory)
     (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)))

 
 ;;;