summaryrefslogtreecommitdiff
path: root/gnu/installer.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2020-02-10 14:47:56 +0100
committerMathieu Othacehe <m.othacehe@gmail.com>2020-02-12 10:52:17 +0100
commitd008352bfb7e48bb275bdf2ff763832aae231a64 (patch)
treee8ab9a30a14dec7f1a71f8ee0abf24be1cd810cc /gnu/installer.scm
parent1d02052067e04d7dd8fd1ec17557ca02a30b9bcf (diff)
downloadguix-patches-d008352bfb7e48bb275bdf2ff763832aae231a64.tar
guix-patches-d008352bfb7e48bb275bdf2ff763832aae231a64.tar.gz
installer: Fix installer restart dialog.
* gnu/installer/newt/final.scm (run-install-failed-page): Propose between installer resume or restart. Do actually resume the installation by raising an &installer-step-abort condition if "Resume" button is pressed. Otherwise, keep going as the installer will be restarted by login. * gnu/installer.scm (installer-program): Remove the associated TODO comment.
Diffstat (limited to 'gnu/installer.scm')
-rw-r--r--gnu/installer.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1676a91801..3f4ae4bf53 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@@ -389,8 +389,9 @@ selected keymap."
;; We did it! Let's reboot!
(sync)
(stop-service 'root))
- (_ ;installation failed
- ;; TODO: Honor the result of 'run-install-failed-page'.
+ (_
+ ;; The installation failed, exit so that it is restarted
+ ;; by login.
#f)))
(const #f)
(lambda (key . args)