From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38415) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j73VM-0000wf-64 for guix-patches@gnu.org; Wed, 26 Feb 2020 15:42:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j73VL-0005X3-0V for guix-patches@gnu.org; Wed, 26 Feb 2020 15:42:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j73VK-0005VQ-Sf for guix-patches@gnu.org; Wed, 26 Feb 2020 15:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j73VK-00068a-QY for guix-patches@gnu.org; Wed, 26 Feb 2020 15:42:02 -0500 Subject: [bug#39698] [PATCH] file-systems: Set default value of the check? field to #f for NFS Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87d0a9i3il.fsf@gmail.com> <87zhdayipo.fsf@gnu.org> <87v9nwklm6.fsf@gmail.com> Date: Wed, 26 Feb 2020 21:41:47 +0100 In-Reply-To: <87v9nwklm6.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 24 Feb 2020 11:15:13 -0500") Message-ID: <878skpcc8k.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Maxim Cournoyer Cc: 39698@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Maxim, Maxim Cournoyer skribis: > From ca38de33a7a31c7b96f7e920038b2fb6352160a8 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > 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 =C2=A9 2019 Guillaume Le Vaillant > ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2019 David C. Trudgian > +;;; Copyright =C2=A9 2020 Maxim Cournoyer > ;;; > ;;; 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 =E2=80=A6 (format (current-error-port) "No file system check procedure for ~a; skipping~%" device))) --8<---------------cut here---------------end--------------->8--- Isn=E2=80=99t it already taking care of not attempting to check NFS? Or, to get rid of the warning, what about: --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ? Thanks, Ludo=E2=80=99. --=-=-=--