[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/21: installer: Improve install page.
From: |
John Darrington |
Subject: |
11/21: installer: Improve install page. |
Date: |
Sat, 31 Dec 2016 14:54:18 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 1ff5718060d31b9fc55b72b6535e51f1d5cd783f
Author: John Darrington <address@hidden>
Date: Wed Dec 28 18:35:12 2016 +0100
installer: Improve install page.
* gnu/system/installer/install.scm (install-page-key-handler) [continue]:
Remove superfluous actions. Improve error handler.
---
gnu/system/installer/install.scm | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index 44da10c..ceeb960 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -80,18 +80,14 @@
(catch #t
(lambda ()
- (and
- ;; Undo any previous attempt to install ...
- (or (pipe-cmd window-port "herd"
- "herd" "stop" "cow-store")
- #t)
-
- (or (pipe-cmd window-port "umount"
- "umount" target) #t)
-
+ (and
(mkdir-p target)
(zero? (pipe-cmd window-port "mount"
"mount" "-t" "ext4" root-device target))
+
+ (zero? (pipe-cmd window-port "herd"
+ "herd" "start" "cow-store" target))
+
(mkdir-p (string-append target "/etc"))
(or (copy-file config-file
(string-append target "/etc/config.scm"))
@@ -99,22 +95,20 @@
(file-exists? (string-append target "/etc/config.scm"))
- ;; Cow store seems to mess with temporary files.
- (zero? (pipe-cmd window-port "herd"
- "herd" "start" "cow-store" target))
-
(zero? (pipe-cmd window-port "guix" "guix" "system" "init"
(string-append target "/etc/config.scm")
- target))))
+ target))
+
+ (display (gettext
+ "Installation is complete. You should reboot now.")
+ window-port)))
(lambda (key . args)
- (addstr* config-window
- (gettext
- (format #f "A \"~s\" exception occured: ~s" key args))))
- )
+ #f)
+ (lambda (key subr message args . rest)
+ (display-error (stack-ref (make-stack #t) 3)
+ window-port subr message args rest)))
(close-port window-port))))
- #f
- )
- )
+ #f))
(define (install-page-refresh page)
(when (not (page-initialised? page))
- 16/21: installer: Prevent the user specifying the same mount point twice., (continued)
- 16/21: installer: Prevent the user specifying the same mount point twice., John Darrington, 2016/12/31
- 04/21: installer: Turn off kernel ring messages to console., John Darrington, 2016/12/31
- 01/21: installer: Add wireless-tools bin directory to PATH., John Darrington, 2016/12/31
- 02/21: installer: Replace an instance of cdr with match., John Darrington, 2016/12/31
- 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 <=
- 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, 2016/12/31
- 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