guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/09: installer: Partition as the last step.


From: guix-commits
Subject: 08/09: installer: Partition as the last step.
Date: Mon, 26 Aug 2019 09:58:00 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit d4d27ddb99280d6d77282ddc2f010c59bff0b665
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sat Jun 8 04:14:02 2019 +0200

    installer: Partition as the last step.
    
    Multiple users have been understandably displeased to find 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(-)

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 15d971d..1676532 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; 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 didn'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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]