From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 YD//OJL0vmXpSQEAqHPOHw:P1 (envelope-from ) for ; Sun, 04 Feb 2024 03:21:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YD//OJL0vmXpSQEAqHPOHw (envelope-from ) for ; Sun, 04 Feb 2024 03:21:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707013266; 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-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; bh=a9qgL8ZQSHMnlTkHX+q72ZlZs/gif0UeDQeG/TkgDTo=; b=aU2zh7biIT5NANLrSxOqdzv+jCTFwPAYPtR/PIhu/w3q29tw9d+wFgl+YsTnSQvySRe1dq x4kz+KdiK3Z/WVdH3bpSFAbAXNK127nn6NNqKD9k5w/bem0k2HHi+3O4CUuYcQHqmP90/P sv0cP3f5RyN9BtJ3S5Zeb4UXIwD2sFNlWh6QVuhTKn9fWKW40E06wnT/wwBFKUVVzAK3aA nCP09rTT2tgRRN4oil02ol5Trg23Fb0x1lEKnOhg/Geqn2QvFA2tcOttJbLFqceq1+eeOs 4vxQzORir0UYpAHkg6u0BG/OscAF21o4vkY4T78VdMEzN27PWsstMU8UIccJuQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707013266; a=rsa-sha256; cv=none; b=hT4rIESmrgPTGxKurfzmN/pZuqtA9rRioDsJMku7YhPiPnQ0FLZFBA42VHUGbILwIRddeM xz3Vv7DmCnOhTNItj5/RoSztBQMBjRhh9Em9wMtR+ThjvsC3YBQCDThCZWPF37UBnfwDsl jjTs6PLwVVYyy8qM9SUf+CfFWZppndkE4WlgB7ezVZ0iYPLGNOJBCwW+C3r/FD4fFqcymA 6jMi9MfSFh5uBlGYkK2uAaXrbavLnbzUiUFkJPTuMzFJ3LPvfR3t2srRRNv/PO7XkS5frf 1KX5Xsm/MKN6P+55+7i1uEdOLytE1SpWH0g4XYDiCK/cE++vmhDBzPDaDsLaFQ== 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 B478111CC5 for ; Sun, 4 Feb 2024 03:21:06 +0100 (CET) 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 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -7.17 X-Spam-Score: -7.17 X-Migadu-Queue-Id: B478111CC5 X-Migadu-Scanner: mx12.migadu.com X-TUID: LMF6fv/lQjjZ * 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?) -- 2.41.0