From patchwork Sun Feb 4 02:19:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 59744 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 4731827BBEB; Sun, 4 Feb 2024 02:21:09 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham 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 15B5D27BBE9 for ; Sun, 4 Feb 2024 02:21:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7p-0006MU-FV; Sat, 03 Feb 2024 21:20:53 -0500 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 1rWS7m-0006Lr-VT for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:51 -0500 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 1rWS7m-0004Au-L0 for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7y-0006aO-1S for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 1/5] gnu: build: file-systems: Extend tmpfs fallback. References: In-Reply-To: Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323025222 (code B ref 65335); Sun, 04 Feb 2024 02:21:02 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:30 +0000 Received: from localhost ([127.0.0.1]:47364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7R-0006Yj-UK for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:30 -0500 Received: from 8.mo583.mail-out.ovh.net ([178.32.116.78]:42025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7N-0006YI-CR for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:28 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.2.235]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 02CB028209 for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-krmn9 (unknown [10.110.113.27]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7FB341FD86; Sun, 4 Feb 2024 02:20:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-krmn9 with ESMTPSA id xjbYF1v0vmWhngAA2JHyhw (envelope-from ); Sun, 04 Feb 2024 02:20:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0049254cd7b-48f8-4658-af9a-92827fe38b15, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:53 +0100 Message-ID: <20240204022004.2785-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 17607667170554929885 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/build/file-systems (canonicalize-device-name): Fallback to tmpfs if spec is "none". Change-Id: Ia55c715d04c7611ba8c979f23f1ad4a8ed2e75b6 --- gnu/build/file-systems.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 36a59f5f5c..78d779f398 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 David C. Trudgian ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -1021,8 +1022,8 @@ (define find-partition-by-luks-uuid (define (canonicalize-device-spec spec) "Return the device name corresponding to SPEC, which can be a , a -, or a string (typically a /dev file name or an nfs-root -containing ':/')." +, the string 'none' or another string (typically a /dev +file name or an nfs-root containing ':/')." (define max-trials ;; Number of times we retry partition label resolution, 1 second per ;; trial. Note: somebody reported a delay of 16 seconds (!) before their @@ -1046,8 +1047,8 @@ (define (resolve find-partition spec fmt) (match spec ((? string?) - (if (string-contains spec ":/") - spec ; do not resolve NFS devices + (if (or (string-contains spec ":/") (string=? spec "none")) + spec ; do not resolve NFS / tmpfs devices ;; Nothing to do, but wait until SPEC shows up. (resolve identity spec identity))) ((? file-system-label?)