summary refs log tree commit diff
path: root/gnu/machine
diff options
context:
space:
mode:
authorStefan <stefan-guix@vodafonemail.de>2020-09-07 10:04:19 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2020-09-07 11:00:48 +0200
commit1c3b709edb8e6248a9a84dde57b27f3fdc997f21 (patch)
treea190d287c7437faead00b2c6a33d59d4919b2a2f /gnu/machine
parent0e5a68a271ab4b6cfa566ff8ba8964aa3b653407 (diff)
downloadguix-1c3b709edb8e6248a9a84dde57b27f3fdc997f21.tar.gz
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>
Diffstat (limited to 'gnu/machine')
-rw-r--r--gnu/machine/ssh.scm2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 4e31baa4b9..35b42add48 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))))