From patchwork Tue Apr 23 20:47:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sent X-Patchwork-Id: 63324 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 50CF327BBEB; Tue, 23 Apr 2024 21:50:30 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 3EF0E27BBE2 for ; Tue, 23 Apr 2024 21:50:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzN5o-0003ZO-Jc; Tue, 23 Apr 2024 16:50:23 -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 1rzN5d-0003UK-CH for guix-patches@gnu.org; Tue, 23 Apr 2024 16:50:09 -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 1rzN5c-0003nd-5d; Tue, 23 Apr 2024 16:50:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzN5s-0003lM-1A; Tue, 23 Apr 2024 16:50:24 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70542] [PATCH 4/4] system: Do not check for CIFS file system availability Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 23 Apr 2024 20:50:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70542@debbugs.gnu.org Cc: Richard Sent , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70542-submit@debbugs.gnu.org id=B70542.171390535913755 (code B ref 70542); Tue, 23 Apr 2024 20:50:23 +0000 Received: (at 70542) by debbugs.gnu.org; 23 Apr 2024 20:49:19 +0000 Received: from localhost ([127.0.0.1]:54269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzN4h-0003Yf-KX for submit@debbugs.gnu.org; Tue, 23 Apr 2024 16:49:16 -0400 Received: from mail-108-mta205.mxroute.com ([136.175.108.205]:39331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzN3n-0003OB-2E for 70542@debbugs.gnu.org; Tue, 23 Apr 2024 16:48:19 -0400 Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta205.mxroute.com (ZoneMTA) with ESMTPSA id 18f0cb70c560003bea.001 for <70542@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 23 Apr 2024 20:47:53 +0000 X-Zone-Loop: 64cc3a143911022501d988fb8399ffcea087e1bc289a X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LBLAiBjTSPvGnakzep01c6deoJNF1KR5XHn9hW3qe9U=; b=CojS/kxOhcEudZ36nlsKHLxOsB 4L+xTsBG+AkBYrVSvvd0ihDLK3EU68JdaHac1hJ1uXa7kxcTg318BHn4aeDKNkkCVSWeQ9ZF+C6gk HZGGfD2M3WE2K2aaDmRWwtxU5ek79DpGcMbzWZzehGlr5JWV3rVHIM91xP50eGIfI0+IkjxXmFCgP YqHV4lMJVSZQdJ+36PovfYEn53GXqfEQtm9QXZawp+9CYKRq+GCz+yiEJC7pjq1ia9uOV2qEHuabf 9XI7MT8TCUAiOYZQhikC9t4X6VpKsUKVt/QK0QwKtBnSB2gM6cfzf5T4sOJdjO23j5T8PT6RnasLM mdZnTkhw==; From: Richard Sent Date: Tue, 23 Apr 2024 16:47:22 -0400 Message-ID: <26b45dc93012f6a25a8eefed69e1c470fc8e4ad8.1713904784.git.richard@freakingpenguin.com> In-Reply-To: References: MIME-Version: 1.0 X-Authenticated-Id: richard@freakingpenguin.com 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: , 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/machine/ssh.scm (machine-check-file-system-availability): Skip checking for CIFS availability, similar to NFS. * guix/scripts/system.scm (check-file-system-availability): Likewise. Change-Id: Ib6452d1b0d3c15028c79b05422ffa317de0a419a --- gnu/machine/ssh.scm | 3 ++- guix/scripts/system.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index b47ce7c225..0be9ebbc0d 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -222,7 +222,8 @@ (define (machine-check-file-system-availability machine) (not (member (file-system-type fs) %pseudo-file-system-types)) ;; Don't try to validate network file systems. - (not (string-prefix? "nfs" (file-system-type fs))) + (not (or (string-prefix? "nfs" (file-system-type fs)) + (string-prefix? "cifs" (file-system-type fs)))) (not (memq 'bind-mount (file-system-flags fs))))) (operating-system-file-systems (machine-operating-system machine)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 2260bcf985..99c58f3812 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -591,7 +591,8 @@ (define (check-file-system-availability file-systems) (not (member (file-system-type fs) %pseudo-file-system-types)) ;; Don't try to validate network file systems. - (not (string-prefix? "nfs" (file-system-type fs))) + (not (or (string-prefix? "nfs" (file-system-type fs)) + (string-prefix? "cifs" (file-system-type fs)))) (not (memq 'bind-mount (file-system-flags fs))))) file-systems))