From unknown Fri Aug 15 20:53:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59066] [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Nov 2022 01:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59066@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16676991853071 (code B ref -1); Sun, 06 Nov 2022 01:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Nov 2022 01:46:25 +0000 Received: from localhost ([127.0.0.1]:58422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orUjx-0000nT-Au for submit@debbugs.gnu.org; Sat, 05 Nov 2022 21:46:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:49674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orUjv-0000nK-Dp for submit@debbugs.gnu.org; Sat, 05 Nov 2022 21:46:24 -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 1orUjv-0001GI-8n for guix-patches@gnu.org; Sat, 05 Nov 2022 21:46:23 -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 1orUjt-0006GI-KT for guix-patches@gnu.org; Sat, 05 Nov 2022 21:46:22 -0400 Date: Sun, 06 Nov 2022 09:45:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1667699178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTkhp9MQPlbPoM8MzaJbo70GgbCNf6kwpkFIVRNbV9o=; b=g6+cn0HFy+Ugw4LFM3vWd3SwlKtygkaYkAJIrXe2r6xsQMXQyLTzesKwJgu8GWE+UnQ+wy acqu1SdZ9tmQt2F/aREGma13stdaodSy3GHqEUFOk7mlX3nqloBaH+OprnH+VihRGGXFhl gRGGdWK+vqw6WTldYb8oyJe1Sq64oqfKa9/5RtmOPeJAUf1YYdOv0BuLUL6ZTZgn2XRKPc 5x0P+5KSDJ5DMIT60uVQLgc+sQTBS+slHTBWJYLAJQ7K1nUxIrxM3jOD7kfbL1EbLiOVKD MUBUxRPygx5N33o9svpfNa+dgXaVdZK78T6KwuZj75jkVucTKgDo/OH8rP3oGQ== Message-ID: From: Hilton Chain MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount. --- gnu/system/linux-initrd.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 4c4c78e444..1e72aaee1c 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -172,6 +172,7 @@ (define* (raw-initrd file-systems #:key (linux linux-libre) (linux-modules '()) + (pre-mount '()) (mapped-devices '()) (keyboard-layout #f) (helper-packages '()) @@ -255,7 +256,8 @@ (define kodir (map spec->file-system '#$(map file-system->spec file-systems)) #:pre-mount (lambda () - (and #$@device-mapping-commands + (and #$@pre-mount + #$@device-mapping-commands #$@file-system-scan-commands)) #:linux-modules '#$linux-modules #:linux-module-directory '#$kodir -- 2.38.0 From unknown Fri Aug 15 20:53:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59066] [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Nov 2022 21:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 59066@debbugs.gnu.org Received: via spool by 59066-submit@debbugs.gnu.org id=B59066.166820234510108 (code B ref 59066); Fri, 11 Nov 2022 21:33:01 +0000 Received: (at 59066) by debbugs.gnu.org; 11 Nov 2022 21:32:25 +0000 Received: from localhost ([127.0.0.1]:46876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otbdQ-0002cy-RS for submit@debbugs.gnu.org; Fri, 11 Nov 2022 16:32:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otbdP-0002cm-9H for 59066@debbugs.gnu.org; Fri, 11 Nov 2022 16:32:23 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otbdJ-0003RB-Tq; Fri, 11 Nov 2022 16:32:17 -0500 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=xnstsx48iLtQJBDKx0ibArPRRiYAYDqMtNl5Jsk3DHo=; b=sSxDuPckeacpPqr/IF0A 0raXOywT5psEQmKrqjUpUMUrWbvvVnSdy8j32q+EbXV9VNJEMDouGE+JOeUkC26Ie04stDDE2Mqyd kqQ/SGXaRuSo4R2t9/jvc9rNb3KYWaoENZyvG6leptQmxdT3jTTljvpq++pHvuYMfYwvRt8IJ6XXK 3rf7E/sodgZdWGy9ckTNZQi+ulXAD+0OeFD3NVXHCtIofKZU+an6jimctHbo8FlePfX8Csap9HReT g33sEw+bbtVTjw0cuitNRdegxFSSl3eman1BwpuzNgjMRvKuIezfEKi1lJG1R9bRJUtFuIS8dIzLS R4g5E6xlt/w2Og==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otbdJ-0000Jq-FY; Fri, 11 Nov 2022 16:32:17 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Fri, 11 Nov 2022 22:32:15 +0100 In-Reply-To: (Hilton Chain's message of "Sun, 06 Nov 2022 09:45:45 +0800") Message-ID: <87wn81dvog.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Hilton Chain skribis: > * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mo= unt. [...] > + (pre-mount '()) > (mapped-devices '()) > (keyboard-layout #f) > (helper-packages '()) > @@ -255,7 +256,8 @@ (define kodir > (map spec->file-system > '#$(map file-system->spec file-systems)) > #:pre-mount (lambda () > - (and #$@device-mapping-commands > + (and #$@pre-mount > + #$@device-mapping-commands I think #:pre-mount should be a single gexp (instead of a list), defaulting to #t. So we=E2=80=99d do: (lambda () (and #$pre-mount #$@device-mapping-commands =E2=80=A6)) WDYT? Also could you update the docstring and =E2=80=98doc/guix.texi=E2=80=99 acc= ordingly? Thanks, Ludo=E2=80=99. From unknown Fri Aug 15 20:53:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59066] [PATCH v2] linux-initrd: raw-initrd: Add keyword argument #:pre-mount. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Nov 2022 14:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 59066@debbugs.gnu.org Received: via spool by 59066-submit@debbugs.gnu.org id=B59066.166826160610459 (code B ref 59066); Sat, 12 Nov 2022 14:01:02 +0000 Received: (at 59066) by debbugs.gnu.org; 12 Nov 2022 14:00:06 +0000 Received: from localhost ([127.0.0.1]:47588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otr3F-0002ib-TX for submit@debbugs.gnu.org; Sat, 12 Nov 2022 09:00:06 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:47346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otr3E-0002hW-7K for 59066@debbugs.gnu.org; Sat, 12 Nov 2022 09:00:04 -0500 Date: Sat, 12 Nov 2022 21:59:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1668261597; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=FY3CIqH8L5jQrs1YCeloacAyRxA+7Hni+ld8pWsKpy8=; b=oYSElN5X4gx40Iux/G8V1NiKgtdnwHoYYYuXZIUumDrWlvqmI28ZQ2S1rM3gmjxrvk61gN Z1XxU8IOiEX6+C2qnuHZwakIOkVvgVTlPRitv3oQ74+ACXbuqNcQPXCv662caEAItIMZiC iniPBjkC6xKVSf/knyz8iXdxgGPOacVoUJgVc0BBdX2dkxeNCTlD/9AMN19w/I+0AYeB7A v9thGp4odpVz96RbIHTziMUxz7vlcEDEFxvYHMrpRM09Azwi5Orx5fu11lFgUJJjxj6/l5 pwTDZykTRFWRKcDiShrsUIIjGzfztBEr0KsFksKu7qgSJD9Hph2J80JQRERnrQ== Message-ID: From: Hilton Chain In-Reply-To: <87wn81dvog.fsf@gnu.org> References: <87wn81dvog.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount. Document it. * doc/guix.texi (initial RAM disk): Likewise. --- v1 -> v2: 1. Use gexp instead of a list. 2. Documentation. Haven't begun my SSH test yet :P doc/guix.texi | 8 +++++--- gnu/system/linux-initrd.scm | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3f76184495..35eb128f6e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37844,15 +37844,17 @@ here is how to use it and customize it further. @cindex initrd @cindex initial RAM disk @deffn {Scheme Procedure} raw-initrd @var{file-systems} @ - [#:linux-modules '()] [#:mapped-devices '()] @ - [#:keyboard-layout #f] @ - [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] + [#:linux-modules '()] [#:pre-mount #t] [#:mapped-devices '()] @ + [#:keyboard-layout #f] [#:helper-packages '()] @ + [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd. @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @option{root}. @var{linux-modules} is a list of kernel modules to be loaded at boot time. @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}). +@var{pre-mount} is a G-expression to evaluate before realizing +@var{mapped-devices}. @var{helper-packages} is a list of packages to be copied in the initrd. It may include @code{e2fsck/static} or other packages needed by the initrd to check diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 4c4c78e444..58e95a1312 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -172,6 +172,7 @@ (define* (raw-initrd file-systems #:key (linux linux-libre) (linux-modules '()) + (pre-mount #t) (mapped-devices '()) (keyboard-layout #f) (helper-packages '()) @@ -183,7 +184,8 @@ (define* (raw-initrd file-systems mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via 'root'. LINUX-MODULES is a list of kernel modules to be loaded at boot time. MAPPED-DEVICES is a list of device -mappings to realize before FILE-SYSTEMS are mounted. +mappings to realize before FILE-SYSTEMS are mounted. PRE-MOUNT is a +G-expression to evaluate before realizing MAPPED-DEVICES. HELPER-PACKAGES is a list of packages to be copied in the initrd. It may include e2fsck/static or other packages needed by the initrd to check root partition. @@ -255,7 +257,8 @@ (define kodir (map spec->file-system '#$(map file-system->spec file-systems)) #:pre-mount (lambda () - (and #$@device-mapping-commands + (and #$pre-mount + #$@device-mapping-commands #$@file-system-scan-commands)) #:linux-modules '#$linux-modules #:linux-module-directory '#$kodir base-commit: 2757de2e2b271d87f6f72ba4161c2225fbdc9e78 -- 2.38.1 From unknown Fri Aug 15 20:53:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Hilton Chain Subject: bug#59066: closed (Re: bug#59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount.) Message-ID: References: <87cz9kcs40.fsf_-_@gnu.org> X-Gnu-PR-Message: they-closed 59066 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 59066@debbugs.gnu.org Date: Fri, 18 Nov 2022 13:26:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1668777963-13027-1" This is a multi-part message in MIME format... ------------=_1668777963-13027-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mo= unt. 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 59066@debbugs.gnu.org. --=20 59066: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D59066 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1668777963-13027-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 59066-done) by debbugs.gnu.org; 18 Nov 2022 13:25:19 +0000 Received: from localhost ([127.0.0.1]:35782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow1Ms-0003Mh-Or for submit@debbugs.gnu.org; Fri, 18 Nov 2022 08:25:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow1Mo-0003MO-Op for 59066-done@debbugs.gnu.org; Fri, 18 Nov 2022 08:25:17 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow1Mj-0000BY-Bw; Fri, 18 Nov 2022 08:25:09 -0500 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=TOO2eDUqsYJrmTyfMZ7BWqFV2e3SOLoDp9VPE67732E=; b=Jo4/gQhvb6qVtcdql7DY QpYCugnZavr/mQC0gQL876QO+Av13MDJHV8tSRvMuL835CKgZt3gRPdVoVOIoRu/d3GXrwDZi80i4 5jiNoFozeu3jrQu4Fhm3xNskrrKm8hGzX+Go+K+5vyGx42N9eqyYTJ1fEPI9/LnA86BQqnzupn9ZM k6G4XQ4cfcAKs4qKjTbLcz4k8OPWXQgJlpi/8oyOaEDvLqpxbtZhMckHgMwOCLtPASReiL0q9LGZZ oDrSBhkm8r//KqxU+NFKL6gqxqdx71IRH0v4rt69Rpk0QsRW//Svqg2dhttm5tqFJZhloN8GYMaL/ mxrXLHAvBUT3BQ==; Received: from [193.50.110.147] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow1Mf-0004jQ-E9; Fri, 18 Nov 2022 08:25:08 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Hilton Chain Subject: Re: bug#59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount. References: <87wn81dvog.fsf@gnu.org> Date: Fri, 18 Nov 2022 14:25:03 +0100 In-Reply-To: (Hilton Chain's message of "Sat, 12 Nov 2022 21:59:26 +0800") Message-ID: <87cz9kcs40.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59066-done Cc: 59066-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Hilton Chain skribis: > * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mo= unt. > Document it. > * doc/guix.texi (initial RAM disk): Likewise. > --- > v1 -> v2: > 1. Use gexp instead of a list. > 2. Documentation. Applied, thanks! > Haven't begun my SSH test yet :P Heh, no rush. :-) Ludo=E2=80=99. ------------=_1668777963-13027-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 Nov 2022 01:46:25 +0000 Received: from localhost ([127.0.0.1]:58422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orUjx-0000nT-Au for submit@debbugs.gnu.org; Sat, 05 Nov 2022 21:46:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:49674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orUjv-0000nK-Dp for submit@debbugs.gnu.org; Sat, 05 Nov 2022 21:46:24 -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 1orUjv-0001GI-8n for guix-patches@gnu.org; Sat, 05 Nov 2022 21:46:23 -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 1orUjt-0006GI-KT for guix-patches@gnu.org; Sat, 05 Nov 2022 21:46:22 -0400 Date: Sun, 06 Nov 2022 09:45:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1667699178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTkhp9MQPlbPoM8MzaJbo70GgbCNf6kwpkFIVRNbV9o=; b=g6+cn0HFy+Ugw4LFM3vWd3SwlKtygkaYkAJIrXe2r6xsQMXQyLTzesKwJgu8GWE+UnQ+wy acqu1SdZ9tmQt2F/aREGma13stdaodSy3GHqEUFOk7mlX3nqloBaH+OprnH+VihRGGXFhl gRGGdWK+vqw6WTldYb8oyJe1Sq64oqfKa9/5RtmOPeJAUf1YYdOv0BuLUL6ZTZgn2XRKPc 5x0P+5KSDJ5DMIT60uVQLgc+sQTBS+slHTBWJYLAJQ7K1nUxIrxM3jOD7kfbL1EbLiOVKD MUBUxRPygx5N33o9svpfNa+dgXaVdZK78T6KwuZj75jkVucTKgDo/OH8rP3oGQ== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount. --- gnu/system/linux-initrd.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 4c4c78e444..1e72aaee1c 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -172,6 +172,7 @@ (define* (raw-initrd file-systems #:key (linux linux-libre) (linux-modules '()) + (pre-mount '()) (mapped-devices '()) (keyboard-layout #f) (helper-packages '()) @@ -255,7 +256,8 @@ (define kodir (map spec->file-system '#$(map file-system->spec file-systems)) #:pre-mount (lambda () - (and #$@device-mapping-commands + (and #$@pre-mount + #$@device-mapping-commands #$@file-system-scan-commands)) #:linux-modules '#$linux-modules #:linux-module-directory '#$kodir -- 2.38.0 ------------=_1668777963-13027-1--