Merge branch 'master' into staging

1 files changed, 9 insertions, 10 deletions

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 584ca3842f..50e2e7d85e 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -174,14 +174,6 @@ selected keymap."
                                         "/share/zoneinfo/zone.tab")))
     #~(lambda (current-installer)
         (list
-         ;; Welcome the user and ask him to choose between manual
-         ;; installation and graphical install.
-         (installer-step
-          (id 'welcome)
-          (compute (lambda _
-                     ((installer-welcome-page current-installer)
-                      #$(local-file "installer/aux-files/logo.txt")))))
-
          ;; Ask the user to choose a locale among those supported by
          ;; the glibc.  Install the selected locale right away, so that
          ;; the user may benefit from any available translation for the
@@ -193,6 +185,14 @@ selected keymap."
                      (#$locale-step current-installer)))
           (configuration-formatter locale->configuration))
 
+         ;; Welcome the user and ask them to choose between manual
+         ;; installation and graphical install.
+         (installer-step
+          (id 'welcome)
+          (compute (lambda _
+                     ((installer-welcome-page current-installer)
+                      #$(local-file "installer/aux-files/logo.txt")))))
+
          ;; Ask the user to select a timezone under glibc format.
          (installer-step
           (id 'timezone)
@@ -256,8 +256,7 @@ selected keymap."
           (description (G_ "Services"))
           (compute (lambda _
                      ((installer-services-page current-installer))))
-	  (configuration-formatter
-           desktop-environments->configuration))
+	  (configuration-formatter system-services->configuration))
 
 	 (installer-step
           (id 'final)