From patchwork Sun Nov 6 01:45:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44346 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 5CB8327BBEB; Sun, 6 Nov 2022 01:47:24 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,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 59A0F27BBEA for ; Sun, 6 Nov 2022 01:47:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orUka-0001JD-1s; Sat, 05 Nov 2022 21:47:04 -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 1orUkZ-0001J0-A3 for guix-patches@gnu.org; Sat, 05 Nov 2022 21:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orUkZ-0006NL-1t for guix-patches@gnu.org; Sat, 05 Nov 2022 21:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orUkY-0000oO-Lo for guix-patches@gnu.org; Sat, 05 Nov 2022 21:47:02 -0400 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: MIME-Version: 1.0 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-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: , Sender: "Guix-patches" 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 X-getmail-retrieved-from-mailbox: Patches * 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