diff mbox series

[bug#36132,1/2] installer: Partition as the last step.

Message ID 20190608044729.14700-1-me@tobias.gr
State Accepted
Headers show
Series [bug#36132,1/2] installer: Partition as the last step. | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Tobias Geerinckx-Rice June 8, 2019, 4:47 a.m. UTC 
Multiple users have been understandably displeased after finding out
that their network card was unsupported, and Internet access mandatory,
after having already formatted their partitions.

* gnu/installer.scm (installer-steps): Run the ‘partition’ step just
before the ‘final’ one.
---
 gnu/installer.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Comments

Ludovic Courtès June 11, 2019, 8:02 a.m. UTC | #1 
Hi!,

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> Multiple users have been understandably displeased after finding out
> that their network card was unsupported, and Internet access mandatory,
> after having already formatted their partitions.
>
> * gnu/installer.scm (installer-steps): Run the ‘partition’ step just
> before the ‘final’ one.

LGTM!  Please add “Fixes <http://bugs.gnu.org/35901>.” in the log.

Should we also move “Network selection” above “Hostname”?

Thanks,
Ludo’.
dziltener--- via Guix-patches via Aug. 26, 2019, 2:23 p.m. UTC | #2 
Ludo',

Ludovic Courtès 写道：
> LGTM!  Please add “Fixes <http://bugs.gnu.org/35901>.” in the 
> log.

Oh, bugger.  This message got lost in my messy box (it floated 
back to the top when I closed the bug).  Sorry about that.

> Should we also move “Network selection” above “Hostname”?

Perhaps!  I'll fire up the installer again and see if anything new 
seems odd/out of place after these few months. 

Kind regards,

T G-R
diff mbox series

Patch

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1452c4dc7e..860c5a9a83 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -1,6 +1,7 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -226,15 +227,6 @@  selected keymap."
                      (#$keymap-step current-installer)))
           (configuration-formatter keyboard-layout->configuration))
 
-         ;; Run a partitioning tool allowing the user to modify
-         ;; partition tables, partitions and their mount points.
-         (installer-step
-          (id 'partition)
-          (description (G_ "Partitioning"))
-          (compute (lambda _
-                     ((installer-partition-page current-installer))))
-          (configuration-formatter user-partitions->configuration))
-
          ;; Ask the user to input a hostname for the system.
          (installer-step
           (id 'hostname)
@@ -267,6 +259,17 @@  selected keymap."
                      ((installer-services-page current-installer))))
 	  (configuration-formatter system-services->configuration))
 
+         ;; Run a partitioning tool allowing the user to modify
+         ;; partition tables, partitions and their mount points.
+         ;; Do this last so the user has something to boot if any
+         ;; of the previous steps doesn't go as expected.
+         (installer-step
+          (id 'partition)
+          (description (G_ "Partitioning"))
+          (compute (lambda _
+                     ((installer-partition-page current-installer))))
+          (configuration-formatter user-partitions->configuration))
+
 	 (installer-step
           (id 'final)
           (description (G_ "Configuration file"))