gnu: pngcrush: Edit description.

[jackhill/guix/guix.git] / gnu / installer.scm

diff --git a/gnu/installer.scm b/gnu/installer.scm
index dfb0c9d..15d971d 100644 (file)
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu system locale)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:export (installer-program))
@@ -68,7 +69,7 @@ version of this file."
         (setlocale LC_ALL "en_US.utf8")))
 
   (define builder
-    (with-extensions (list guile-json)
+    (with-extensions (list guile-json-3)
       (with-imported-modules (source-module-closure
                               '((gnu installer locale)))
         #~(begin
@@ -118,7 +119,7 @@ been performed at build time."
        (string-append #$file "/" #$name ".go")))
 
   (let* ((supported-locales #~(supported-locales->locales
-                               #$(local-file "installer/aux-files/SUPPORTED")))
+                               #+(glibc-supported-locales)))
          (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/"))
          (iso639-3 #~(string-append #$iso-codes "iso_639-3.json"))
          (iso639-5 #~(string-append #$iso-codes "iso_639-5.json"))
@@ -291,6 +292,7 @@ selected keymap."
                                cryptsetup
                                dosfstools ;mkfs.fat
                                e2fsprogs ;mkfs.ext4
+                               btrfs-progs
                                kbd ;chvt
                                guix ;guix system init call
                                util-linux ;mkwap
@@ -311,9 +313,10 @@ selected keymap."
     ;; packages …), etc. modules.
     (with-extensions (list guile-gcrypt guile-newt
                            guile-parted guile-bytestructures
-                           guile-json guile-git guix)
+                           guile-json-3 guile-git guix)
       (with-imported-modules `(,@(source-module-closure
                                   `(,@modules
+                                    (gnu services herd)
                                     (guix build utils))
                                   #:select? module-to-import?)
                                ((guix config) => ,(make-config.scm)))
@@ -334,6 +337,8 @@ selected keymap."
                          (gnu services herd)
                          (guix i18n)
                          (guix build utils)
+                         ((system repl debug)
+                          #:select (terminal-width))
                          (ice-9 match))
 
             ;; Initialize gettext support so that installers can use
@@ -357,16 +362,31 @@ selected keymap."
             (bindtextdomain "xkeyboard-config"
                             #+(file-append xkeyboard-config "/share/locale"))
 
+            ;; Initialize 'terminal-width' in (system repl debug)
+            ;; to a large-enough value to make backtrace more
+            ;; verbose.
+            (terminal-width 200)
+
             (let* ((current-installer newt-installer)
                    (steps (#$steps current-installer)))
               ((installer-init current-installer))
 
               (catch #t
                 (lambda ()
-                  (run-installer-steps
-                   #:rewind-strategy 'menu
-                   #:menu-proc (installer-menu-page current-installer)
-                   #:steps steps))
+                  (define results
+                    (run-installer-steps
+                     #:rewind-strategy 'menu
+                     #:menu-proc (installer-menu-page current-installer)
+                     #:steps steps))
+
+                  (match (result-step results 'final)
+                    ('success
+                     ;; We did it!  Let's reboot!
+                     (sync)
+                     (stop-service 'root))
+                    (_                            ;installation failed
+                     ;; TODO: Honor the result of 'run-install-failed-page'.
+                     #f)))
                 (const #f)
                 (lambda (key . args)
                   (let ((error-file "/tmp/last-installer-error"))