jmd pushed a commit to branch wip-installer
in repository guix.
commit ee01da8b3801de7dd1b88d7c33d7af1a0d26b99a
Author: John Darrington <[email protected]>
Date: Mon Jan 16 21:47:16 2017 +0100
installer: Do not allow the creation of invalid file-system specificaitons.
* gnu/system/installer/filesystems.scm (make-file-system-spec): Return #f
if the
filesystem type is not valid.
---
gnu/system/installer/filesystems.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index e100bbd..fee17c0 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -62,12 +62,12 @@
(define valid-file-system-types `(ext2 ext3 ext4 btrfs swap))
(define (make-file-system-spec mount-point label type)
- (let ((uuid (slurp "uuidgen" identity)))
- (make-file-system-spec' mount-point label
- (if (memq (string->symbol type)
valid-file-system-types)
+ (if (memq (string->symbol type) valid-file-system-types)
+ (let ((uuid (slurp "uuidgen" identity)))
+ (make-file-system-spec' mount-point label
(string->symbol type)
- #f)
- (car uuid))))
+ (car uuid)))
+ #f))
