[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/21: installer: Allow users to remove mount points during configuratio
From: |
John Darrington |
Subject: |
15/21: installer: Allow users to remove mount points during configuration. |
Date: |
Sat, 31 Dec 2016 14:54:18 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 2ee7267d162dff65cf32fc7987d8699254c89b9f
Author: John Darrington <address@hidden>
Date: Fri Dec 30 14:28:47 2016 +0100
installer: Allow users to remove mount points during configuration.
* gnu/system/installer/mount-point.scm (mount-point-page-key-handler):
Remove mount-point from alist if it is the null string.
---
gnu/system/installer/mount-point.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/system/installer/mount-point.scm
b/gnu/system/installer/mount-point.scm
index 5ea0235..61649ac 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -63,9 +63,14 @@
(eq? ch #\nl))
(cond
((buttons-key-matches-symbol? nav ch 'continue)
- (set! mount-points (assoc-set! mount-points
- dev
- (form-get-value form
'mount-point)))
+ (let ((mp (form-get-value form 'mount-point)))
+ (if (equal? "" mp)
+ (set! mount-points
+ (assoc-remove! mount-points dev))
+
+ (set! mount-points (assoc-set! mount-points
+ dev mp))))
+
(set! page-stack (cdr page-stack))
((page-refresh (car page-stack)) (car page-stack)))
- 08/21: installer: Use consistent window heights., (continued)
- 08/21: installer: Use consistent window heights., John Darrington, 2016/12/31
- 20/21: installer: Do not use /tmp for holding the configuration., John Darrington, 2016/12/31
- 14/21: installer: Issue message to user on failure of filesystems task., John Darrington, 2016/12/31
- 07/21: installer: Rename module "new" to "guixsd-installer"., John Darrington, 2016/12/31
- 13/21: installer: Replace spawned mount command with the mount syscall., John Darrington, 2016/12/31
- 11/21: installer: Improve install page., John Darrington, 2016/12/31
- 10/21: installer: Replace "%temporary-configuration-file-port" with "config-file"., John Darrington, 2016/12/31
- 19/21: installer: Use global variable instead of string literal for "/gnu"., John Darrington, 2016/12/31
- 17/21: installer: Change N_ from a procedure to a macro., John Darrington, 2016/12/31
- 18/21: installer: Change the order of the filesystem task conditions., John Darrington, 2016/12/31
- 15/21: installer: Allow users to remove mount points during configuration.,
John Darrington <=
- 21/21: installer: Add a console-keymap service., John Darrington, 2016/12/31
- 09/21: installer: Fix bug where window-pipe did not return the proper exit status., John Darrington, 2016/12/31