[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/26: installer: Do not allow the creation of invalid file-system speci
From: |
John Darrington |
Subject: |
03/26: installer: Do not allow the creation of invalid file-system specificaitons. |
Date: |
Sun, 22 Jan 2017 12:09:24 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit ee01da8b3801de7dd1b88d7c33d7af1a0d26b99a
Author: John Darrington <address@hidden>
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))
- 07/26: gurses: Change highlighting from bold to inverse., (continued)
- 07/26: gurses: Change highlighting from bold to inverse., John Darrington, 2017/01/22
- 04/26: installer: Do not add file systems which are invalid., John Darrington, 2017/01/22
- 10/26: installer: Check that swap spaces have not been assigned mount points, John Darrington, 2017/01/22
- 14/26: installer: Distinguish between Wifi encryption methods., John Darrington, 2017/01/22
- 01/26: installer: Extend the 'file-system' concept to include swap spaces., John Darrington, 2017/01/22
- 21/26: installer: Do not assume the root file system is of type "ext4"., John Darrington, 2017/01/22
- 17/26: installer: Note which types of file system are supported., John Darrington, 2017/01/22
- 25/26: installer: Emphasise that writing filesystems destroys existing data., John Darrington, 2017/01/22
- 05/26: installer: Fix bug where the selected item of main page was not indicated., John Darrington, 2017/01/22
- 08/26: gurses: form: Use match instead of car, cdr etc., John Darrington, 2017/01/22
- 03/26: installer: Do not allow the creation of invalid file-system specificaitons.,
John Darrington <=
- 15/26: gurses: Allow menu update to work for panel windows., John Darrington, 2017/01/22
- 18/26: gurses: Populate the choices box in forms., John Darrington, 2017/01/22
- 06/26: installer: Add an explanatory text to the main page., John Darrington, 2017/01/22
- 22/26: installer: mount-points page: Enlarge the forms window., John Darrington, 2017/01/22
- 13/26: installer: Remove unnecessary "begin"., John Darrington, 2017/01/22
- 24/26: installer: Remove redundant list of file system types., John Darrington, 2017/01/22
- 20/26: gurses: Populate dropdown boxes in forms using a menu., John Darrington, 2017/01/22
- 12/26: installer: Fix bug in config generation., John Darrington, 2017/01/22
- 26/26: doc: Remove the text which mentions there is no graphical installer., John Darrington, 2017/01/22
- 19/26: installer: Add a popup window for forms which have multiple choice fields., John Darrington, 2017/01/22