me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Mathieu Othacehe 2020-02-10 14:47:56 +01:00
parent 1d02052067
commit d008352bfb
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/installer.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
@ -389,8 +389,9 @@ selected keymap."
;; We did it! Let's reboot! ;; We did it! Let's reboot!
(sync) (sync)
(stop-service 'root)) (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))) #f)))
(const #f) (const #f)
(lambda (key . args) (lambda (key . args)

21
gnu/installer/newt/final.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -27,6 +27,7 @@
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:use-module (newt) #:use-module (newt)
#:export (run-final-page)) #:export (run-final-page))
@ -73,12 +74,18 @@ press the button to reboot."))
'success) 'success)
(define (run-install-failed-page) (define (run-install-failed-page)
(choice-window (match (choice-window
(G_ "Installation failed") (G_ "Installation failed")
(G_ "Restart installer") (G_ "Resume")
(G_ "Retry system install") (G_ "Restart the installer")
(G_ "The final system installation step failed. You can retry the \ (G_ "The final system installation step failed. You can resume from \
last step, or restart the installer."))) a specific step, or restart the installer."))
(1 (raise
(condition
(&installer-step-abort))))
(2
;; Keep going, the installer will be restarted later on.
#t)))
(define* (run-install-shell locale (define* (run-install-shell locale
#:key (users '())) #:key (users '()))