From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ED3kCoPlrGKMLgEAbAwnHQ (envelope-from ) for ; Fri, 17 Jun 2022 22:35:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qF/uCYPlrGLbbQAAG6o9tA (envelope-from ) for ; Fri, 17 Jun 2022 22:35:15 +0200 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 B7E4A2A3F2 for ; Fri, 17 Jun 2022 22:35:14 +0200 (CEST) Received: from localhost ([::1]:46512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2IgT-0007l3-0A for larch@yhetil.org; Fri, 17 Jun 2022 16:35:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2IgK-0007iv-0d for guix-patches@gnu.org; Fri, 17 Jun 2022 16:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2IgJ-0002SZ-Of for guix-patches@gnu.org; Fri, 17 Jun 2022 16:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2IgJ-0000J3-KN for guix-patches@gnu.org; Fri, 17 Jun 2022 16:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55231] [PATCH v1] initrd: Allow extra search paths with =?UTF-8?Q?=E2=80=98initrd-extra-module-paths=E2=80=99?= Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jun 2022 20:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brian Cully Cc: 55231@debbugs.gnu.org Received: via spool by 55231-submit@debbugs.gnu.org id=B55231.16554981021151 (code B ref 55231); Fri, 17 Jun 2022 20:35:03 +0000 Received: (at 55231) by debbugs.gnu.org; 17 Jun 2022 20:35:02 +0000 Received: from localhost ([127.0.0.1]:47054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2IgH-0000IU-G4 for submit@debbugs.gnu.org; Fri, 17 Jun 2022 16:35:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2IgF-0000IF-DB for 55231@debbugs.gnu.org; Fri, 17 Jun 2022 16:35:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2Ig9-0002K2-TY; Fri, 17 Jun 2022 16:34:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=NJz4haW/cg2WS6PGmNGmiyZmt3u+4ucvnFUqTqPj5y8=; b=VNtUGY0WoT8ELPaoDi8G OlaGJDIGcPcf6aADcg52uYmeyR5iK7W5Vz/O2sjlm6CaiduPu/+ZUgxJ9ywyIWXdPsHvtCRvVHfT8 spEDW7Uai6OmpAv+/D9JNBMsTkxconDnig39MbqONfdSwPdcSDysHLetZ8YNZhJIuZ3lCeGEd3rxV dbm+IQH00j1tSxQ8mN2aDpNIeqkW2z2RmU7+yzaYUczolaprk+B2/exBhpPkEA3Svo/a33rjvn2VD wzK2g+dx9brsZW0+7f7Nd4lJxTzbTkOGSLLVfTLL/IiWiotLAAVLAkH4SDPzTwyD2g6IMm7Qx3Zg/ aUV3yIFXqR/yzA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:60076 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2Ig9-0006Iv-GB; Fri, 17 Jun 2022 16:34:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87wnf3pv87.fsf@ditto.jhoto.spork.org> <88d91cf303fd82c3667149ee8a647527f44bf571.1655430718.git.bjc@spork.org> Date: Fri, 17 Jun 2022 22:34:51 +0200 In-Reply-To: <88d91cf303fd82c3667149ee8a647527f44bf571.1655430718.git.bjc@spork.org> (Brian Cully's message of "Thu, 16 Jun 2022 21:51:59 -0400") Message-ID: <878rpvdo5w.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655498114; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=NJz4haW/cg2WS6PGmNGmiyZmt3u+4ucvnFUqTqPj5y8=; b=Fg5QaB+ISCIO2x59yIj2IiTT7a8t3G4kxKcNsbbg6CeLZfKmDVuvJ7TgtaWTAkkl2u4K7l s60QmYtBXb8K4U4r7w9vZvPC5ppSQMIvJPft92aElD+KTrX1VWy5yOn51plEk8k6TWmS4F 76a3+mehLMKgk/dREpg9Jy7i9kh3oVIDcfPSiNSXVDH7UX++rVGswbu8R2X72rnuuX3QOP C+rmWDd9hA9pW64Cyjz28kec7gEABkpVcmp6SXwughM7MVjDuKGw3iZsyHPBF9xr5hBA11 2LDGkddaQ949HgRnAJe80xzqsPia1iYbd3gHe5wGfxNobwrpscaqdd/xPL3Bfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655498114; a=rsa-sha256; cv=none; b=maTag8PzL6jFyxap3X7MML59UcPJCbpTZ5dx/ygeetB3L5HhtxZIp+3H3u4wmfQhsr1ANW 1hSvHTEEGqb7kUK7zlxgRo7TkQaH0paDkQAiehR55amrkd0LttaSm21mS8E5ymOWL6mv4w fbybmY5VHbFrO4PY6bo++ynUJKHxOb1r234OXcyjVxRgze16qmiACYoUsjFasbiwkq4fvM UR2pN2MeU3JC8AUTZJnIeBXsmrg9D79snegBR0FWQJSoliGJ1hbHNsYB7Uwix9UwHbpBko LMzhjIiceUBxM33hceaybyIs6HPuwirLFdfjk/7YnM37M7JCTf3JXnpQ6FzyzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VNtUGY0W; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -5.09 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VNtUGY0W; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: B7E4A2A3F2 X-Spam-Score: -5.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: yOwImlIm9QmK Hi Brian, Brian Cully skribis: > With this patch, modules for =E2=80=98initrd-modules=E2=80=99 will not on= ly be searched for in > the in-tree Linux modules, but also any additional modules specified in > =E2=80=98kernel-loadable-modules=E2=80=99. > > * gnu/build/linux-modules.scm (find-module-file): change DIRECTORY argume= nt to > DIRECTORIES. Now takes a list of directories to search, rather than a sin= gle > one. > * gnu/system/linux-initrd.scm (flat-linux-module-directory): change LINUX > argument to PACKAGES. Now contains a list of file-likes to search for mod= ules. > (raw-initrd): Add LINUX-EXTRA-MODULE-PATHS keyword argument. Pass it > to (flat-linux-extra-module-paths) along with the selected LINUX package. > (base-initrd): Add LINUX-EXTRA-MODULE-PATHS keyword argument. Pass it > to (raw-initrd). > * gnu/system.scm (operating-system-initrd-file): pass in operating system > definition's kernel-loadable-modules into (make-initrd) as > LINUX-EXTRA-MODULE-PATHS. > --- > > I've removed the new operating-system slot in preference to re-using > kernel-loadable-modules, as discussed. > > I did leave the old argument names for the lower level routines in place, > as I feel that they more accurately represent how the data are being > used. > > I've also pulled out the documentation. Once this patch set is beaten > into acceptability, the documentation can be adjusted if that's deemed > necessary. Alright! It looks great to me. I have two cosmetic comments: > + (define (package+out->input package out) > + (gexp-input package out)) I think you can remove this definition and use =E2=80=98gexp-input=E2=80=99= directly. > @@ -172,20 +183,23 @@ (define* (raw-initrd file-systems > #:key > (linux linux-libre) > (linux-modules '()) > + (linux-extra-module-paths '()) Nitpick: I=E2=80=99d call it #:linux-extra-module-path (singular, as in =E2= =80=9Csearch path=E2=80=9D) or simply #:linux-extra-module-directories. If you could introduce a couple of lines in doc/guix.texi to explain where modules are searched for, that=E2=80=99d be perfect. Thanks for taking the time to prepare this revision! Ludo=E2=80=99.