guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

33/197: installer: Improve dependencies on the final task.


From: Danny Milosavljevic
Subject: 33/197: installer: Improve dependencies on the final task.
Date: Mon, 3 Jul 2017 20:36:55 -0400 (EDT)

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit a92d62584fb9a0055723de9a1d0d6ffc464cd4fc
Author: John Darrington <address@hidden>
Date:   Mon Dec 26 10:50:45 2016 +0100

    installer: Improve dependencies on the final task.
    
    * gnu/system/installer/new.scm (main-options) [install]: set 'generate as
    dependency. [generate]: Define better completion predicate.
---
 gnu/system/installer/new.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/system/installer/new.scm b/gnu/system/installer/new.scm
index 67f41fb..97cb850 100644
--- a/gnu/system/installer/new.scm
+++ b/gnu/system/installer/new.scm
@@ -113,7 +113,12 @@
 
     (generate . , (make-task generate-menu-title
                              '(filesystems timezone hostname)
-                             (lambda () #f)
+                             (lambda ()
+                               (let ((filename
+                                      (port-filename 
%temporary-configuration-file-port)))
+                                 (and (file-exists? filename)
+                                      (positive? (stat:size (stat 
filename))))))
+
                              (lambda (page)
                                (make-configure-page
                                 page
@@ -121,7 +126,7 @@
                              
     (install .  ,(make-task installation-menu-title
                             ;;                            '(generate network)
-                            '(filesystems)
+                            '(generate)
                             (lambda () #f)
                             (lambda (page)
                               (make-install-page



reply via email to

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