Subject: bug#69841: closed (Re: bug#69841: Acknowledgement ([PATCH] linux-modules: Ignore nonexistent module files on boot.))

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 27 Mar 2024 14:52:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
69841: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69841
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#69841: Acknowledgement ([PATCH] linux-modules: Ignore nonexistent module files on boot.)
From: Hilton Chain <[email-masked]>
To: [email-masked]
Cc: Wilko Meyer <[email-masked]>, Ludovic Courtès <[email-masked]>, Tobias Geerinckx-Rice <[email-masked]>, Leo Famulari <[email-masked]>
Date: Wed, 27 Mar 2024 22:43:12 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Applied as 7995816ec4c38e447a2dcbeb33243180709e177d, closing.

Subject: [PATCH] linux-modules: Ignore nonexistent module files on boot.
From: Hilton Chain <[email-masked]>
To: [email-masked]
Cc: Hilton Chain <[email-masked]>
Date: Sun, 17 Mar 2024 16:52:06 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

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

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

 
 ;;;

base-commit: 5267c6073c3bdc6ba7874fc776c23c928f1ee263
--
2.41.0