summaryrefslogtreecommitdiff
path: root/gnu/system.scm
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/system.scm
parent0e5a68a271ab4b6cfa566ff8ba8964aa3b653407 (diff)
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/system.scm')
-rw-r--r--gnu/system.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index f092df56ce..bdb696fe2e 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)