From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KMcgBJyv9mVP9QAA62LTzQ:P1 (envelope-from ) for ; Sun, 17 Mar 2024 09:53:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id KMcgBJyv9mVP9QAA62LTzQ (envelope-from ) for ; Sun, 17 Mar 2024 09:53:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Ms+sd5Ho; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710665628; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=yvw09HvfsldJLJkkPIIBvWYJVkegtFULTDGgUw082tM=; b=qKJHzj7jcRJWA2fFNkGIoVqvR6WnpNIJ5J3y+LmksqMCreHIGDnKrxpZXJ1mqRV3XWNvJr LODG5MR3n4iJnk7TpxwtmarxMZWEOfevF/W5Ud9H7PWCDQ2jmZyn0XJLgpyQJgy7oGlHHi RnSxsSqUKiOG63Z/UBcnDD5w5qUTi99oCr/wx7x/XlSKE7Nrn2pYlF7eYPOBpd2rQzQTlF fnZOxMybwiSEKJlemgGgNmidOERAJqDO/M/x1R3SQ9WowCNhptQKEwO1oS/igX2szpEFxc rQ+mJQp+HdFdz8kTd9M9TWk3zP7y+T9kOqFOaIFw9DrH1HPBeb141gu6gFZ76g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Ms+sd5Ho; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710665628; a=rsa-sha256; cv=none; b=DU+IkcfgLzjxzaf+DIWLwSFiNRrKI+PoSvQiS2pNxU5COo0MOFlqfpqCMHULHLwj3O5m5j 1W+uHfCdrwm3ATzdKtWYVHRBcOGN2XnXtcqb/uv9fhzt0AlDedl6vL5F8N8Uyry7ljwfUl 8KenB/F0xTb0yGDEkDyJ5q9SI1kx8V2R+8B9NxUs+6fUdGR6CsVYAWos2ZwFtohU+Oqs3C baqfUp3fDBatSVEmOAFbPYVTKbSMt1C1w5apQRn5+I6u4hUkFv6mLc7e2oQrOqZuH8HhhT zNk5TF5SDqW5J9sTkLAEGEnyMu8zy2GfnqvHA6A6MPkSq3ouaj1b+6U6p7YXuw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F1BF813EA1 for ; Sun, 17 Mar 2024 09:53:47 +0100 (CET) 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== Date: Sun, 17 Mar 2024 16:52:06 +0800 Message-ID: <219ed2009b2279a16d4fc4ca9bf773f73d7d07cd.1710662827.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.50 X-Spam-Score: -6.50 X-Migadu-Queue-Id: F1BF813EA1 X-TUID: qh+JO04BA/UU 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