[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/21: installer: Change the order of the filesystem task conditions.
From: |
John Darrington |
Subject: |
18/21: installer: Change the order of the filesystem task conditions. |
Date: |
Sat, 31 Dec 2016 14:54:18 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit baedb399b322d21e153454a2514d91110dbac7cb
Author: John Darrington <address@hidden>
Date: Fri Dec 30 20:55:50 2016 +0100
installer: Change the order of the filesystem task conditions.
* gnu/system/installer/filesystems.scm (filesystem-task-incomplete-reason):
Make the
exitance of the root, the first condition.
---
gnu/system/installer/filesystems.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/system/installer/filesystems.scm
b/gnu/system/installer/filesystems.scm
index 4297ef3..5040eca 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -42,15 +42,16 @@
(define (filesystem-task-incomplete-reason)
"Returns #f if the task is complete. Otherwise a string explaining why not."
(or
+ (and (not (find-mount-device "/" mount-points))
+ (N_ "You must specify a mount point for the root (/)."))
+
+
(and (< (size-of-partition (find-mount-device "/gnu" mount-points))
minimum-store-size)
(format #f
(N_ "The filesystem for /gnu requires at least ~aGB.")
(/ minimum-store-size 1000)))
- (and (not (find-mount-device "/" mount-points))
- (N_ "You must specify a mount point for the root (/)."))
-
(let loop ((ll mount-points)
(ac '()))
(match ll
- 12/21: installer: Close unused ports in pipe-cmd., (continued)
- 12/21: installer: Close unused ports in pipe-cmd., John Darrington, 2016/12/31
- 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 <=
- 15/21: installer: Allow users to remove mount points during configuration., John Darrington, 2016/12/31
- 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