[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
61/80: installer: Change the order of the filesystem task conditions.
From: |
John Darrington |
Subject: |
61/80: installer: Change the order of the filesystem task conditions. |
Date: |
Tue, 3 Jan 2017 15:49:45 +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
- 30/80: installer: Add a variable to represent the minimum recommended store size., (continued)
- 30/80: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2017/01/03
- 44/80: installer: Add wireless-tools bin directory to PATH., John Darrington, 2017/01/03
- 41/80: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2017/01/03
- 40/80: installer: Ensure that all mount-points have a file system., John Darrington, 2017/01/03
- 42/80: installer: Correct bugs generating the configuration., John Darrington, 2017/01/03
- 47/80: installer: Turn off kernel ring messages to console., John Darrington, 2017/01/03
- 39/80: installer: New predicate valid-hostname?, John Darrington, 2017/01/03
- 48/80: installer: Enable scrolling in the installation window., John Darrington, 2017/01/03
- 46/80: installer: Add inetutils bin directory to PATH., John Darrington, 2017/01/03
- 33/80: installer: Write the configuration to a temporary file., John Darrington, 2017/01/03
- 61/80: installer: Change the order of the filesystem task conditions.,
John Darrington <=
- 43/80: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2017/01/03
- 45/80: installer: Replace an instance of cdr with match., John Darrington, 2017/01/03
- 32/80: installer: Add a task to actually call guix system init., John Darrington, 2017/01/03
- 38/80: installer: Replace some instances of "car"., John Darrington, 2017/01/03
- 26/80: installer: Add a new menu to configure wireless interfaces., John Darrington, 2017/01/03
- 59/80: installer: Prevent the user specifying the same mount point twice., John Darrington, 2017/01/03
- 57/80: installer: Issue message to user on failure of filesystems task., John Darrington, 2017/01/03
- 64/80: installer: Add a console-keymap service., John Darrington, 2017/01/03
- 71/80: installer: Make setting up of the network a prerequisite., John Darrington, 2017/01/03
- 55/80: installer: Close unused ports in pipe-cmd., John Darrington, 2017/01/03