[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
107/197: installer: Do not allow the creation of invalid file-system spe
From: |
Danny Milosavljevic |
Subject: |
107/197: installer: Do not allow the creation of invalid file-system specificaitons. |
Date: |
Mon, 3 Jul 2017 20:37:08 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit e0af416aa727c8028f994f27a035067d990a8f8d
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))
- 74/197: installer: Remove explicit calls to curs-set from pages., (continued)
- 74/197: installer: Remove explicit calls to curs-set from pages., Danny Milosavljevic, 2017/07/03
- 64/197: installer: Make setting up of the network a prerequisite., Danny Milosavljevic, 2017/07/03
- 80/197: installer: Ignore case in button accelerators., Danny Milosavljevic, 2017/07/03
- 86/197: installer: slurp: Ignore blank lines in output., Danny Milosavljevic, 2017/07/03
- 76/197: installer: New procedure "page-leave"., Danny Milosavljevic, 2017/07/03
- 84/197: installer: Use guix build syscalls module for network interrogation., Danny Milosavljevic, 2017/07/03
- 94/197: installer: Add the notion of uuids to prospective filesystems., Danny Milosavljevic, 2017/07/03
- 89/197: installer: Make the network menu more reliable., Danny Milosavljevic, 2017/07/03
- 90/197: installer: Enable direct scrolling to top or bottom of menus., Danny Milosavljevic, 2017/07/03
- 78/197: installer: Ensure that the cursor visibility is updated on each page., Danny Milosavljevic, 2017/07/03
- 107/197: installer: Do not allow the creation of invalid file-system specificaitons.,
Danny Milosavljevic <=
- 57/197: installer: Add a console-keymap service., Danny Milosavljevic, 2017/07/03
- 69/197: installer: Remove "continue" button from host name page., Danny Milosavljevic, 2017/07/03
- 58/197: installer: Add flags to indicate network interface status., Danny Milosavljevic, 2017/07/03
- 72/197: installer: Use --fallback when installing., Danny Milosavljevic, 2017/07/03
- 73/197: installer: Correct behaviour of push-cursor and pop-cursor procedures., Danny Milosavljevic, 2017/07/03
- 77/197: installer: New procedure: page-enter., Danny Milosavljevic, 2017/07/03
- 82/197: installer: Rename 'file-browser.scm' to 'key-map.scm'., Danny Milosavljevic, 2017/07/03
- 63/197: installer: Change essid --> wireless., Danny Milosavljevic, 2017/07/03
- 70/197: installer: Rename "file-browser" -> "time-zone"., Danny Milosavljevic, 2017/07/03
- 81/197: installer: Make all windows with ports scrollable., Danny Milosavljevic, 2017/07/03