[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/22: installer: Improve dependencies on the final task.
From: |
John Darrington |
Subject: |
16/22: installer: Improve dependencies on the final task. |
Date: |
Tue, 27 Dec 2016 06:02:09 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 1bc42815c97265e5585a257d88a434c03d02cffa
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
- branch wip-installer updated (704f546 -> d654694), John Darrington, 2016/12/27
- 01/22: installer: Return slurped lines in their correct order., John Darrington, 2016/12/27
- 15/22: installer: Remove ad-hoc completed predicate and use standard one., John Darrington, 2016/12/27
- 02/22: installer: Fix incorrect host in ping task., John Darrington, 2016/12/27
- 06/22: installer: Connect ethernet interfaces on selection., John Darrington, 2016/12/27
- 14/22: installer: Make minumum-store-size variable global., John Darrington, 2016/12/27
- 04/22: installer: Use a cleaner way of generating the lspci information., John Darrington, 2016/12/27
- 16/22: installer: Improve dependencies on the final task.,
John Darrington <=
- 22/22: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2016/12/27
- 09/22: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2016/12/27
- 17/22: installer: Replace some instances of "car"., John Darrington, 2016/12/27
- 20/22: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2016/12/27
- 03/22: installer: Make "interfaces" return an alist., John Darrington, 2016/12/27
- 13/22: installer: Add path to mount/umount commands in installer service., John Darrington, 2016/12/27
- 10/22: gnu: Add service to start the installer in installation-os., John Darrington, 2016/12/27
- 11/22: installer: Add a task to actually call guix system init., John Darrington, 2016/12/27
- 18/22: installer: New predicate valid-hostname?, John Darrington, 2016/12/27
- 21/22: installer: Correct bugs generating the configuration., John Darrington, 2016/12/27