From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 69841@debbugs.gnu.org
Cc: "Hilton Chain" <hako@ultrarare.space>,
"Leo Famulari" <leo@famulari.name>,
"Tobias Geerinckx-Rice" <me@tobias.gr>,
"Wilko Meyer" <w@wmeyer.eu>, "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#69841] [PATCH] linux-modules: Ignore nonexistent module files on boot.
Date: Sun, 17 Mar 2024 16:52:06 +0800 [thread overview]
Message-ID: <219ed2009b2279a16d4fc4ca9bf773f73d7d07cd.1710662827.git.hako@ultrarare.space> (raw)
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)))
\f
;;;
base-commit: 5267c6073c3bdc6ba7874fc776c23c928f1ee263
--
2.41.0
next reply other threads:[~2024-03-17 8:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-17 8:52 Hilton Chain via Guix-patches via [this message]
[not found] ` <handler.69841.B.171066563620411.ack@debbugs.gnu.org>
2024-03-27 14:43 ` bug#69841: Acknowledgement ([PATCH] linux-modules: Ignore nonexistent module files on boot.) Hilton Chain via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=219ed2009b2279a16d4fc4ca9bf773f73d7d07cd.1710662827.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=69841@debbugs.gnu.org \
--cc=hako@ultrarare.space \
--cc=leo@famulari.name \
--cc=ludo@gnu.org \
--cc=me@tobias.gr \
--cc=w@wmeyer.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).