From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49308) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZTH0-00045r-OV for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZTGx-0000Yr-3a for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZTGs-0000WR-FU for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hZTGs-0000jL-BZ for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:02 -0400 Subject: [bug#36132] [PATCH 1/2] installer: Partition as the last step. Resent-Message-ID: From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 06:47:28 +0200 Message-Id: <20190608044729.14700-1-me@tobias.gr> In-Reply-To: <87y32c663d.fsf@nckx> References: <87y32c663d.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36132@debbugs.gnu.org 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(-) 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 ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; 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")) -- 2.21.0