07/07: linux-boot: Allow the root file system to be mounted via NFS.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit afc57916e5398737e13d94b3823983783221eb63
Author: Stefan <address@hidden>
AuthorDate: Sun Apr 26 21:21:38 2020 +0200

    linux-boot: Allow the root file system to be mounted via NFS.
    
    * gnu/build/linux-boot.scm (boot-system) Treat a root option with ":/" as 
an nfs source
    and avoid to call 'canonicalize-device-spec' for it.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/build/linux-boot.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 4fb711b..05e833c 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -534,10 +534,13 @@ upon error."
             ;; 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.
-            (let ((root (cond ((string-prefix? "/" root) root)
-                              ((uuid root) => identity)
-                              (else (file-system-label root)))))
-              (mount-root-file-system (canonicalize-device-spec root)
+            (let ((device-spec (cond ((string-prefix? "/" root) root)
+                                     ((uuid root) => identity)
+                                     ((string-contains root ":/") #f) ; nfs
+                                     (else (file-system-label root)))))
+              (mount-root-file-system (if device-spec
+                                          (canonicalize-device-spec 
device-spec)
+                                          root)
                                       root-fs-type
                                       #:volatile-root? volatile-root?
                                       #:flags root-fs-flags