From patchwork Wed Aug 16 09:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 15924 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 400F127BBEA; Wed, 16 Aug 2023 10:30:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 9CBB327BBE2 for ; Wed, 16 Aug 2023 10:30:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCrK-0001Ym-4c; Wed, 16 Aug 2023 05:30:35 -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 1qWCqo-0001T7-Tq for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:05 -0400 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 1qWCqo-0000aC-Ko for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCqo-0006Jl-El for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH 1/4] file-systems: canonicalize-device-name: Ignore the "none" case. References: In-Reply-To: Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:30: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: ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.169217819724249 (code B ref 65335); Wed, 16 Aug 2023 09:30:02 +0000 Received: (at 65335) by debbugs.gnu.org; 16 Aug 2023 09:29:57 +0000 Received: from localhost ([127.0.0.1]:38845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqi-0006J2-KN for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:29:56 -0400 Received: from 4.mo581.mail-out.ovh.net ([178.32.122.254]:43701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqg-0006Is-FV for 65335@debbugs.gnu.org; Wed, 16 Aug 2023 05:29:55 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.138.83]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 43F2E26ECB for <65335@debbugs.gnu.org>; Wed, 16 Aug 2023 09:29:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-fwpb5 (unknown [10.111.208.172]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EB2C51FDDB; Wed, 16 Aug 2023 09:29:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-fwpb5 with ESMTPSA id 7GxGMhCX3GSZWQMAFOcv1w (envelope-from ); Wed, 16 Aug 2023 09:29:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022bc3d26e-6c6f-4f20-85a7-fd8561f8a645, EFC9AD881B11E31D841027839B6E0A93490164A7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 16 Aug 2023 11:29:26 +0200 Message-ID: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 10885481777719075554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddtledgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 1a92b3f43c280f143b00f8bb95a173fb85e52664 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 36a59f5f5c..e39bd31c3b 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1021,8 +1021,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 +1046,8 @@ (define (canonicalize-device-spec spec) (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?)