jmd pushed a commit to branch wip-installer
in repository guix.
commit 3f13dddc40091ed2d25f4049b00a8a59389e010f
Author: John Darrington <[email protected]>
Date: Wed Jan 18 08:41:13 2017 +0100
installer: Check that swap spaces have not been assigned mount points
* gnu/system/installer/filesystems.scm (filesystem-task-incomplete?): Show
an
error if the user has tried to allocate a mount point to a swap filesystem.
---
gnu/system/installer/filesystems.scm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index c7ff029..dec473d 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -82,6 +82,14 @@
(and (not (find-mount-device "/" mount-points))
(M_ "You must specify a mount point for the root (/)."))
+ (fold (lambda (x prev)
+ (or prev
+ (match x
+ ((dev . ($ <file-system-spec> mp label type uuid))
+ (if (and (eq? type 'swap) (not (zero? (string-length
mp))))
+ (gettext "Swap systems should not have a mount
point")
+ #f)))))
+ #f mount-points)
(let ((non-absolute-list
(fold (lambda (x prev)
