From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0IlOIDeR4mTzWgEASxT56A (envelope-from ) for ; Mon, 21 Aug 2023 00:18:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YKJGIDeR4mSmKwAAauVa8A (envelope-from ) for ; Mon, 21 Aug 2023 00:18:31 +0200 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 E0BC330DE5 for ; Mon, 21 Aug 2023 00:18:30 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692569911; 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-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=AJpTsnjeQApLsNzQAD6TINVPfVS6EMRrrv4n91yv4Qc=; b=u7MPAgj7VDfqMhQwSXqDLr+tM0ZctUBvGfPtPvZ6EO8h/Sr9/GUBvPwCzMsPTlXHHlssK+ MAJ+wryLmZDSy0ty3c+upbS+r4/pGCbFc6vh4bUoboCY9WXO4M016aaZkuD1QZrKSZ1kz6 197qBjiiGQFBXznwmWkppf2yAcZD4855jjxZQDRTZYto80gJpx2Wz3uebKOUFXoje3H5x2 F7sixtZoB3VuGqZyC5HwfTzIFuB2lUsm9lY32XJeDb9nd/KEYANkViLWzIn6wuyOI+pkKJ CQ0vywMgIf2tsAoCPkhA/vOwX7OQXf7haoo4fqUVCW+QGMNshoPk+X8IZCCfpw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692569911; a=rsa-sha256; cv=none; b=JO8AuoVo+MToMDTrOQAo3+cjzMkIN7tSW6ct9smtbdh9KEQ+3PwQqQwZLeNX5Hgvr20TD2 wDYJuSP3NyJl07R8Ip+MmlaBtrerNnz0YolvNPEhYJtnsxaMsnan5GHYJbQRX2C7wymCal L0GvpZDi8TuyManokHPKBVIds/0F6Tz6Si0a++2psFp9hO7mHoQaBDkGpRYkK9DmLAHmgH f2Sf5BKfXVyW/nZkEit1gqniYw6xzmtRyuSRWABGRqqjh9mA+p2qjDa5RrWeqOJn6DQDJW rc/DVu0TZO5no28KKABoOrpJQstN8f2ctdFvKvgcoIsnijUJK25UBk3uOiMGnQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXqkE-00041Q-6R; Sun, 20 Aug 2023 18:18:02 -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 1qXqkC-00040t-O8 for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:00 -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 1qXqkC-00018S-G7 for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXqkE-0003Xn-7V for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v2 1/5] 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: Sun, 20 Aug 2023 22:18: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.169256982613513 (code B ref 65335); Sun, 20 Aug 2023 22:18:02 +0000 Received: (at 65335) by debbugs.gnu.org; 20 Aug 2023 22:17:06 +0000 Received: from localhost ([127.0.0.1]:55021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXqjJ-0003Vn-UB for submit@debbugs.gnu.org; Sun, 20 Aug 2023 18:17:06 -0400 Received: from 20.mo561.mail-out.ovh.net ([178.33.47.94]:39553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXqjH-0003Va-6x for 65335@debbugs.gnu.org; Sun, 20 Aug 2023 18:17:04 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.156.6]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 1AE1E21A87 for <65335@debbugs.gnu.org>; Sun, 20 Aug 2023 22:17:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kv22r (unknown [10.110.171.249]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D53841FE48; Sun, 20 Aug 2023 22:16:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-kv22r with ESMTPSA id BnnGMtuQ4mTN7wYArZbfwg (envelope-from ); Sun, 20 Aug 2023 22:16:59 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Mon, 21 Aug 2023 00:16:43 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10438218038388908770 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddukedgtdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -6.20 X-Spam-Score: -6.20 X-Migadu-Queue-Id: E0BC330DE5 X-TUID: /eP/+c5vaK8W --- gnu/build/file-systems.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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?) base-commit: a0f5885fefd93a3859b6e4b82b18a6db9faeee05 prerequisite-patch-id: cccdad83975cbf04d7bd618c2c1a4b4de6fa7fd2 prerequisite-patch-id: 6f28833d2efa054d55126980f87ba4d2fdd13c6d prerequisite-patch-id: afc6cadece838372370f7093f863ce8eaae7bc55 prerequisite-patch-id: b9330c12700355319c104aa3b493eafe03cbb619 prerequisite-patch-id: 46fa9c5a48fcc5b13409049b14b6e7314a6d6956 prerequisite-patch-id: 846f8b50b8de749caaa459b874087d06e15e0a80 prerequisite-patch-id: 023101e5a315951ce9786fb8230955c97001dac9 prerequisite-patch-id: d4b0193f128d8236026e079e746ea0cf6c4c0af0 prerequisite-patch-id: d73442d6d7c88e7375e9de0a9cd655cacb7766f9 prerequisite-patch-id: d8a56dd7bc6c1c3ba3ac0f77b2402b9c6469cfb2 prerequisite-patch-id: 3bc2b2eecd799be8d8b0f96b850ef83a6306dab7 prerequisite-patch-id: 798d4a277eff03a59339af4ebe19406682f361ab prerequisite-patch-id: 3f65e9cdab64edeacfeb5748cd4fb130839b2b30 prerequisite-patch-id: 6f8225b63a1dd1866b05bb91544e49d7c096601c prerequisite-patch-id: ff71ec9bdf6337390a720db4535268af271e32df prerequisite-patch-id: c6b40cc38f5bdfab229ac3d7ed4346c5d9f1b2f7 prerequisite-patch-id: 9ab6dade9e641d5e667ba6a61dbfbb3d32c943a6 prerequisite-patch-id: 4fcae29a8f6dd95716669680141da315acaf6e59 prerequisite-patch-id: 0a5a6da0061188dc9be59bc9829db53288307c58 prerequisite-patch-id: 83c4b7d9d831990e4d37ba89c584d773c872ba6b prerequisite-patch-id: 1c8dddf99041cf399b8836e3ad6721d7bbcebb7c prerequisite-patch-id: 773df13cc85606b205d1d914e59525b7a6820a1d prerequisite-patch-id: 6f8974ce8c0a3a25721a41781f9b0dfd61e96cf4 prerequisite-patch-id: d219948d28923c5ccd34b63f988032df33f2f336 prerequisite-patch-id: 0bd75bb28df9ccf3405caf8217d708afc978047d prerequisite-patch-id: 26476dd782cf8f5e427d4bd36ac85957538a0aa3 prerequisite-patch-id: b5f87c460fd984c41fbb52e7e0dc305c20c46f22 prerequisite-patch-id: 5502b9c6a64abaca6a9921f25cd324869d26aa1e prerequisite-patch-id: a7e84bb368349566e9a6fdbe49a371fdb464bb1e prerequisite-patch-id: a84a766ceef6bedd5da3f9512c87a2c2a11ff33f prerequisite-patch-id: 0175b2b1cbbc15c1c775147821715bca9e3303a3 prerequisite-patch-id: 9c20b408ac8aa275ecba58383d83be5cef7647df prerequisite-patch-id: 836749cd3bd3b86f64de637c3c2df48a3608f09f prerequisite-patch-id: 28ea1ddbef32a1bc9e908f3f9c7466953c60f13d prerequisite-patch-id: 52a78e387e36e6408d7147950195d552e4e41528 prerequisite-patch-id: 87fee01a70d4b8cbfca44cc0a9c9f54471a92d18 prerequisite-patch-id: 8c8cdb345e815fc3332805ca224103f185d4a568 prerequisite-patch-id: 3434c5caf1eba9e9a64c673681e5911d2c1d9232 prerequisite-patch-id: c45bf303726fb3dacee01a66c0ff75105a81164d prerequisite-patch-id: d44a1adb0404f23522aac21fa8a7f26be7ddabdc prerequisite-patch-id: e422fe29bbcef80260b190637faa1a4953c3f1cb prerequisite-patch-id: 285479a1a1e46e6f0f8aba5429edfa400c81b32b prerequisite-patch-id: 30fcff6f8c9328c71d3fca609cddde0b56973bb7 prerequisite-patch-id: 70bb47ccac3375de893e4e640ce7c59369a05a39 prerequisite-patch-id: cc3d79386ca4a93146dc195cd5732764f1ac447f prerequisite-patch-id: 2686866ec4bf08c7faa05b17cb84d9e0c13ec12c prerequisite-patch-id: 369b61e07e3c90151a5414b784513b9ae3d3e978 prerequisite-patch-id: 065651c3a8cee63b725d7f86c080c274b494627e prerequisite-patch-id: 1ee71844f0c9a0112a456e5b76079239906a7fb8 prerequisite-patch-id: c7b3d9c5bff04c16576781eff50ce37f7c49131c prerequisite-patch-id: c8b8fe8dc51fea0b8a2626cf7031f01b6000e023 prerequisite-patch-id: 182e25335d4c357001f4f8bed2b3f89b91d9cae5 prerequisite-patch-id: c0ea00d5f4c6a83642a92c9341f0288fbfe3095a prerequisite-patch-id: 795d31cc33a24a6a57e67af31b65acd8faa8187c prerequisite-patch-id: 358af8aa7fa71b5cb8fbe6dde29d141bb7c57f1e prerequisite-patch-id: b9ab3ee98a9d4ca518a4d99042982d64fbce5d05 prerequisite-patch-id: 12b76e9c2751da73ed64c9489b15f74ff17568cf prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2 prerequisite-patch-id: c6bbe6026bfcd2c9ff6e06efc5b8424a6943d1bf prerequisite-patch-id: 1dc9b52f102fa787539119b849a14224ef7b4fa5 prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4 prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707 prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e prerequisite-patch-id: 45e65ea00ece53f3496251401acd464081f8ca7a prerequisite-patch-id: c3bc83367aa2aab9f121fe3bdbbd9e48dee860ea -- 2.41.0