summaryrefslogtreecommitdiff
path: root/gnu/build/file-systems.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-02-11 14:00:06 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-05-20 08:30:34 -0400
commit281d80d8e547fe663aaacb3226119166dd3100f9 (patch)
treeb666edb5528f263fa857ef231a4824f2ec1ffe7e /gnu/build/file-systems.scm
parent42d41d86f38958ebcff370b0e56da5c69165943c (diff)
linux-boot: Refactor boot-system.
The --root option can now be omitted, and inferred from the root file system declaration instead. * gnu/build/file-systems.scm (canonicalize-device-spec): Extend to support NFS directly, and... * gnu/build/linux-boot.scm (boot-system): ...remove NFS special casing from here. Remove nested definitions for root-fs-type, root-fs-flags and root-fs-options, and bind those inside the let* instead. Make "--root" take precedence over the device field string representation of the root file system. * doc/guix.texi (Initial RAM Disk): Document that "--root" can be left unspecified.
Diffstat (limited to 'gnu/build/file-systems.scm')
-rw-r--r--gnu/build/file-systems.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index b920e8fc62..ad92d8a496 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -661,8 +661,10 @@ were found."
(match spec
((? string?)
- ;; Nothing to do, but wait until SPEC shows up.
- (resolve identity spec identity))
+ (if (string-contains spec ":/")
+ spec ; do not resolve NFS devices
+ ;; Nothing to do, but wait until SPEC shows up.
+ (resolve identity spec identity)))
((? file-system-label?)
;; Resolve the label.
(resolve find-partition-by-label