From patchwork Sun Mar 17 08:52:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 61884 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7C3E127BBEB; Sun, 17 Mar 2024 08:53:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A978D27BBEA for ; Sun, 17 Mar 2024 08:53:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlmGl-0002Ht-Dk; Sun, 17 Mar 2024 04:53:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlmGj-0002Hf-Gb for guix-patches@gnu.org; Sun, 17 Mar 2024 04:53:25 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rlmGj-0001wi-7s; Sun, 17 Mar 2024 04:53:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rlmHK-0005Jd-Cc; Sun, 17 Mar 2024 04:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69841] [PATCH] linux-modules: Ignore nonexistent module files on boot. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 17 Mar 2024 08:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69841 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69841@debbugs.gnu.org Cc: Hilton Chain , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by submit@debbugs.gnu.org id=B.171066563620411 (code B ref -1); Sun, 17 Mar 2024 08:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Mar 2024 08:53:56 +0000 Received: from localhost ([127.0.0.1]:57640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlmHE-0005J8-0r for submit@debbugs.gnu.org; Sun, 17 Mar 2024 04:53:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:54178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlmHD-0005Ix-6i for submit@debbugs.gnu.org; Sun, 17 Mar 2024 04:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlmGb-0002HK-GW for guix-patches@gnu.org; Sun, 17 Mar 2024 04:53:17 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlmGa-0001wL-4J for guix-patches@gnu.org; Sun, 17 Mar 2024 04:53:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1710665538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yvw09HvfsldJLJkkPIIBvWYJVkegtFULTDGgUw082tM=; b=Ms+sd5Ho4jCu01iF4waDLhgbYBdx41yxQSFCWva/Zyuyoyf1hJxXO/iyTOAVZvCru/V3W6 l6ibGl5OEIgbkIP3kATdF7zrZxVVnIXvgGPvQ1oaPGefXCauMDF0nMzadPnjlBm8Wir7Hk xeWc0CuPbpZmRQsxqWMcYKmuVPRoTdzcjqnv91q0M4tJnBD2SOC7aEbFqPfypMaWzum7AG 9cNj+BaFkcyXKzaKkKp5VyA13FCuJAK/k96IwBlz+q1xdJbjdTPSrtP8C6NqDhmx+GqkAS gIFo7eXfztavR1I5QuDt09jSbOM9tq2M3hbVE4i8o2QUSsyimxrolRJVVZN+SQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sun, 17 Mar 2024 16:52:06 +0800 Message-ID: <219ed2009b2279a16d4fc4ca9bf773f73d7d07cd.1710662827.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: - Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 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))) ;;;