diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-02-10 14:47:56 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-02-12 10:52:17 +0100 |
| commit | d008352bfb7e48bb275bdf2ff763832aae231a64 (patch) | |
| tree | e8ab9a30a14dec7f1a71f8ee0abf24be1cd810cc /gnu/installer.scm | |
| parent | 1d02052067e04d7dd8fd1ec17557ca02a30b9bcf (diff) | |
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.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 1676a91801f..3f4ae4bf537 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> | 2 | ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> |
| 3 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> | 4 | ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> |
| 5 | ;;; | 5 | ;;; |
| @@ -389,8 +389,9 @@ selected keymap." | |||
| 389 | ;; We did it! Let's reboot! | 389 | ;; We did it! Let's reboot! |
| 390 | (sync) | 390 | (sync) |
| 391 | (stop-service 'root)) | 391 | (stop-service 'root)) |
| 392 | (_ ;installation failed | 392 | (_ |
| 393 | ;; TODO: Honor the result of 'run-install-failed-page'. | 393 | ;; The installation failed, exit so that it is restarted |
| 394 | ;; by login. | ||
| 394 | #f))) | 395 | #f))) |
| 395 | (const #f) | 396 | (const #f) |
| 396 | (lambda (key . args) | 397 | (lambda (key . args) |
