From 50884fca871cfceb020d63e556c957163fdd6064 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Feb 2020 14:47:56 +0100 Subject: [PATCH 2/2] 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. --- gnu/installer.scm | 5 +++-- gnu/installer/newt/final.scm | 15 +++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 1676a91801..806f80ec9c 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -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) diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 061bcd3f78..fb1b2281da 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -73,12 +73,15 @@ press the button to reboot.")) 'success) (define (run-install-failed-page) - (choice-window - (G_ "Installation failed") - (G_ "Restart installer") - (G_ "Retry system install") - (G_ "The final system installation step failed. You can retry the \ -last step, or restart the installer."))) + (case (choice-window + (G_ "Installation failed") + (G_ "Resume") + (G_ "Restart the installer") + (G_ "The final system installation step failed. You can resume from \ +a specific step, or restart the installer.")) + ((1) (raise + (condition + (&installer-step-abort)))))) (define* (run-install-shell locale #:key (users '())) -- 2.25.0