guix-commits
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]