branch master updated: linux-boot: Handle nfs-root device strings.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1c3b709  linux-boot: Handle nfs-root device strings.
1c3b709 is described below

commit 1c3b709edb8e6248a9a84dde57b27f3fdc997f21
Author: Stefan <stefan-guix@vodafonemail.de>
AuthorDate: Mon Sep 7 10:04:19 2020 +0200

    linux-boot: Handle nfs-root device strings.
    
    * gnu/build/linux-boot.scm (device-string->file-system-device): Support
    nfs-root "device" strings.
    * gnu/build/file-systems.scm (canonicalize-device-spec): Support nfs-root
    "device" strings.
    * gnu/machine/ssh.scm (machine-check-file-system-availability): Avoid
    checking of NFS file systems.
    * gnu/system.scm (read-boot-parameters, device-sexp->device): Support
    nfs-root "device" strings.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/build/file-systems.scm |  3 ++-
 gnu/build/linux-boot.scm   |  5 +++--
 gnu/machine/ssh.scm        |  2 ++
 gnu/system.scm             | 12 +++++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 4ba1503..734d648 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -675,7 +675,8 @@ were found."
 
 (define (canonicalize-device-spec spec)
   "Return the device name corresponding to SPEC, which can be a <uuid>, a
-<file-system-label>, or a string (typically a /dev file name)."
+<file-system-label>, or a 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
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 80fe0cf..32e3536 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -469,9 +469,10 @@ upon error."
 
   (define (device-string->file-system-device device-string)
     ;; The "--root=SPEC" kernel command-line option always provides a
-    ;; string, but the string can represent a device, a UUID, or a
-    ;; label.  So check for all three.
+    ;; string, but the string can represent a device, an nfs-root, a UUID, or a
+    ;; label.  So check for all four.
     (cond ((string-prefix? "/" device-string) device-string)
+          ((string-contains device-string ":/") device-string) ; nfs-root
           ((uuid device-string) => identity)
           (else (file-system-label device-string))))
 
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 4e31baa..35b42ad 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -172,6 +172,8 @@ exist on the machine."
               (and (file-system-mount? fs)
                    (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 (memq 'bind-mount (file-system-flags fs)))))
             (operating-system-file-systems (machine-operating-system 
machine))))
 
diff --git a/gnu/system.scm b/gnu/system.scm
index f092df5..bdb696f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -316,11 +316,13 @@ file system labels."
       ((? bytevector? bv)                         ;old format
        (bytevector->uuid bv 'dce))
       ((? string? device)
-       ;; It used to be that we would not distinguish between labels and
-       ;; device names.  Try to infer the right thing here.
-       (if (string-prefix? "/dev/" device)
-           device
-           (file-system-label device)))))
+       (if (string-contains device ":/")
+           device ; nfs-root
+           ;; It used to be that we would not distinguish between labels and
+           ;; device names.  Try to infer the right thing here.
+           (if (string-prefix? "/" device)
+               device
+               (file-system-label device))))))
 
   (match (read port)
     (('boot-parameters ('version 0)