From: "Ludovic Courtès" <ludo@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 39698@debbugs.gnu.org
Subject: [bug#39698] [PATCH] file-systems: Set default value of the check? field to #f for NFS
Date: Wed, 26 Feb 2020 21:41:47 +0100 [thread overview]
Message-ID: <878skpcc8k.fsf@gnu.org> (raw)
In-Reply-To: <87v9nwklm6.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 24 Feb 2020 11:15:13 -0500")
[-- Attachment #1: Type: text/plain, Size: 2700 bytes --]
Hi Maxim,
Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
> From ca38de33a7a31c7b96f7e920038b2fb6352160a8 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Mon, 24 Feb 2020 11:08:42 -0500
> Subject: [PATCH] build: file-systems: Skip check for NFS file systems
>
> * gnu/build/file-systems.scm (mount-file-system): Do not call
> `check-file-system' when the file system is of NFS type.
> ---
> gnu/build/file-systems.scm | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
> index cfa3898f83..76c143654d 100644
> --- a/gnu/build/file-systems.scm
> +++ b/gnu/build/file-systems.scm
> @@ -5,6 +5,7 @@
> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
> ;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -663,6 +664,7 @@ corresponds to the symbols listed in FLAGS."
> (string-append "," options)
> "")))))
> (let* ((type (file-system-type fs))
> + (nfs? (string-prefix? "nfs" type))
> (fs-options (file-system-options fs))
> (options (if (null? fs-options)
> #f
> @@ -671,7 +673,7 @@ corresponds to the symbols listed in FLAGS."
> (mount-point (string-append root "/"
> (file-system-mount-point fs)))
> (flags (mount-flags->bit-mask (file-system-flags fs))))
> - (when (file-system-check? fs)
> + (when (and (file-system-check? fs) (not nfs?))
> (check-file-system source type))
Looking more closely, I see this:
--8<---------------cut here---------------start------------->8---
(define (check-file-system device type)
"Run a file system check of TYPE on DEVICE."
(define check-procedure
(cond
((string-prefix? "ext" type) check-ext2-file-system)
((string-prefix? "btrfs" type) check-btrfs-file-system)
((string-suffix? "fat" type) check-fat-file-system)
((string-prefix? "jfs" type) check-jfs-file-system)
(else #f)))
(if check-procedure
…
(format (current-error-port)
"No file system check procedure for ~a; skipping~%"
device)))
--8<---------------cut here---------------end--------------->8---
Isn’t it already taking care of not attempting to check NFS?
Or, to get rid of the warning, what about:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 475 bytes --]
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index ee6375515f..faf64ce304 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -581,6 +581,7 @@ were found."
((string-prefix? "btrfs" type) check-btrfs-file-system)
((string-suffix? "fat" type) check-fat-file-system)
((string-prefix? "jfs" type) check-jfs-file-system)
+ ((string-prefix? "nfs" type) (const 'pass))
(else #f)))
(if check-procedure
[-- Attachment #3: Type: text/plain, Size: 26 bytes --]
?
Thanks,
Ludo’.
next prev parent reply other threads:[~2020-02-26 20:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 17:15 [bug#39698] [PATCH] file-systems: Set default value of the check? field to #f for NFS Maxim Cournoyer
[not found] ` <handler.39698.B.158221893829402.ack@debbugs.gnu.org>
2020-02-20 20:29 ` [bug#39698] Acknowledgement ([PATCH] file-systems: Set default value of the check? field to #f for NFS) Maxim Cournoyer
2020-02-22 11:17 ` [bug#39698] [PATCH] file-systems: Set default value of the check? field to #f for NFS Ludovic Courtès
2020-02-24 16:15 ` Maxim Cournoyer
2020-02-26 20:41 ` Ludovic Courtès [this message]
2020-03-03 5:05 ` bug#39698: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878skpcc8k.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=39698@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.