diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
| commit | 37da4fbe1562583589eeddb4be8e11bece80fd35 (patch) | |
| tree | 4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /gnu/installer/newt/final.scm | |
| parent | 73326e742d82b6706333885eca770f7518636b1f (diff) | |
| parent | e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff) | |
| download | guix-patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar guix-patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer/newt/final.scm')
| -rw-r--r-- | gnu/installer/newt/final.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 645c1e8689..f492c5dbb7 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -65,22 +65,23 @@ press the button to reboot."))) (G_ "The final system installation step failed. You can retry the \ last step, or restart the installer."))) -(define (run-install-shell) +(define (run-install-shell locale) (clear-screen) (newt-suspend) - (let ((install-ok? (install-system))) + (let ((install-ok? (install-system locale))) (newt-resume) install-ok?)) (define (run-final-page result prev-steps) - (let* ((configuration (format-configuration prev-steps result)) + (let* ((configuration (format-configuration prev-steps result)) (user-partitions (result-step result 'partition)) + (locale (result-step result 'locale)) (install-ok? (with-mounted-partitions user-partitions (configuration->file configuration) (run-config-display-page) - (run-install-shell)))) + (run-install-shell locale)))) (if install-ok? (run-install-success-page) (run-install-failed-page)))) |