From patchwork Sat Jun 8 04:47:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 14260 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C36C7170B6; Sat, 8 Jun 2019 05:48:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 77AA0170B4 for ; Sat, 8 Jun 2019 05:48:16 +0100 (BST) Received: from localhost ([::1]:55030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZTH4-00046v-US for patchwork@mira.cbaines.net; Sat, 08 Jun 2019 00:48:14 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#36132] [PATCH 1/2] installer: Partition as the last step. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jun 2019 04:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36132@debbugs.gnu.org Received: via spool by 36132-submit@debbugs.gnu.org id=B36132.15599692682777 (code B ref 36132); Sat, 08 Jun 2019 04:48:02 +0000 Received: (at 36132) by debbugs.gnu.org; 8 Jun 2019 04:47:48 +0000 Received: from localhost ([127.0.0.1]:52712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZTGd-0000ic-KR for submit@debbugs.gnu.org; Sat, 08 Jun 2019 00:47:47 -0400 Received: from tobias.gr ([80.241.217.52]:45456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZTGc-0000iU-18 for 36132@debbugs.gnu.org; Sat, 08 Jun 2019 00:47:46 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 4197d695 for <36132@debbugs.gnu.org>; Sat, 8 Jun 2019 04:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=2018; i=me@tobias.gr; bh=+wixusxayAUUcNiCG5AIgLiufmf5zUTrv3OOjP6mjLs=; b=hiaRp9EeYkcv ybTRYEQ3Y48wVBoSKlELTWfcejMnXefWOxgSgFt+yOSyyPUC5xMbf91nF+fiGYeq jdUfhIpq334msSZQbsvlvjmyKqE3u9ndpC/7Z0oNU5Cv8P1MDhsQAWGdAiV09v4w TVpCN+ttPJhxczkDevwgZZYkL1toS5DHN7F+ZOM2jFXEaFP8FduuFntPNRALq0zM raOfpTVbn7smimQPAeiVgtt4LtMAoM6SqpPYlZVAJD3oyuX4qKr4PJq7QUji9XLg OdS6noMC/WC8AAahAhcG7CY1hsPdj7CvomVJMncWobmdF8klcxXvugwJMZYoSPfk 9mRfiowk7w== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 75ab985f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <36132@debbugs.gnu.org>; Sat, 8 Jun 2019 04:47:42 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 06:47:28 +0200 Message-Id: <20190608044729.14700-1-me@tobias.gr> X-Mailer: git-send-email 2.21.0 In-Reply-To: <87y32c663d.fsf@nckx> References: <87y32c663d.fsf@nckx> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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")) From patchwork Sat Jun 8 04:47:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 14259 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 829F7170B3; Sat, 8 Jun 2019 05:48:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7183B170B3 for ; Sat, 8 Jun 2019 05:48:15 +0100 (BST) Received: from localhost ([::1]:55028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZTH3-000463-C1 for patchwork@mira.cbaines.net; Sat, 08 Jun 2019 00:48:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49307) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZTH0-00045q-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-0000Yl-3X for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZTGs-0000Wd-UQ 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-0000jT-Rm for guix-patches@gnu.org; Sat, 08 Jun 2019 00:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36132] [PATCH 2/2] installer: Show, don't Hide. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jun 2019 04:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36132@debbugs.gnu.org Received: via spool by 36132-submit@debbugs.gnu.org id=B36132.15599692702788 (code B ref 36132); Sat, 08 Jun 2019 04:48:02 +0000 Received: (at 36132) by debbugs.gnu.org; 8 Jun 2019 04:47:50 +0000 Received: from localhost ([127.0.0.1]:52714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZTGf-0000it-UU for submit@debbugs.gnu.org; Sat, 08 Jun 2019 00:47:50 -0400 Received: from tobias.gr ([80.241.217.52]:45456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZTGd-0000iU-2z for 36132@debbugs.gnu.org; Sat, 08 Jun 2019 00:47:47 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 753fc507 for <36132@debbugs.gnu.org>; Sat, 8 Jun 2019 04:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=2018; i=me@tobias.gr; bh=lp3QCKWeuDcmMumJ3KFMjvddB0KTlYXApEfUOxi/5cI=; b=dqIRzCME25md CNqqKaQP6i+gp1v/p/WRA5mx0ujbA8KBmnCKDXM8ZtKZF/uKTn5Ljhps57IvpCa6 QsgL1NlL57KjXONtWdpx8AnsUqxoY94JAwfIPFs4Sqbys184buqQi0FCwe7g/+CP MGDIwLxKzLTAiMEn3pvVPWdzvkWxvaoWikmFwBG/LtCHUplSyWrPszi+V6kJN7SH YOGtctO3BGb1j+gDYOGfBQEd8tOO5/hHxdImZFA70LQkgnWP7JdEliGlUM5FUZ7X hfnFWJt6rQdLEZCINjMoLjgXMl7QXAwJ/s1xZjXQoJnh1gJKOWfSmInnHSD0v7Cu hZnwvg1YlQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a904824a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <36132@debbugs.gnu.org>; Sat, 8 Jun 2019 04:47:42 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 06:47:29 +0200 Message-Id: <20190608044729.14700-2-me@tobias.gr> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190608044729.14700-1-me@tobias.gr> References: <87y32c663d.fsf@nckx> <20190608044729.14700-1-me@tobias.gr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/installer/newt/user.scm (run-user-add-page): Change the input visibility checkbox's text to ‘Show’, and default to unchecked. * gnu/installer/newt/page.scm (run-input-page): Likewise. Rename INPUT-HIDE-CHECKBOX? argument to INPUT-SHOW-CHECKBOX?. --- gnu/installer/newt/page.scm | 9 +++++---- gnu/installer/newt/user.scm | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 728721c08f..b061988336 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.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. ;;; @@ -75,7 +76,7 @@ this page to TITLE." #:key (allow-empty-input? #f) (default-text #f) - (input-hide-checkbox? #f) + (input-show-checkbox? #f) (input-field-width 40) (input-flags 0)) "Run a page to prompt user for an input. The given TEXT will be displayed @@ -88,8 +89,8 @@ input box, such as FLAG-PASSWORD." input-field-width #:flags FLAG-BORDER)) (input-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) - (input-flags* (if input-hide-checkbox? + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) + (input-flags* (if input-show-checkbox? (logior FLAG-PASSWORD FLAG-SCROLL input-flags) input-flags)) @@ -102,7 +103,7 @@ input box, such as FLAG-PASSWORD." (apply horizontal-stacked-grid GRID-ELEMENT-COMPONENT input-entry - `(,@(if input-hide-checkbox? + `(,@(if input-show-checkbox? (list GRID-ELEMENT-COMPONENT input-visible-cb) '()))) GRID-ELEMENT-COMPONENT ok-button)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index dab805198f..3ef105fe81 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.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. ;;; @@ -55,7 +56,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (entry-home-directory (make-entry -1 -1 entry-width #:initial-value home-directory)) (password-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) (entry-password (make-entry -1 -1 entry-width #:flags (logior FLAG-PASSWORD FLAG-SCROLL))) @@ -156,7 +157,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please confirm the password.") (G_ "Password confirmation required") #:allow-empty-input? #t - #:input-hide-checkbox? #t)) + #:input-show-checkbox? #t)) (if (string=? password confirmation) password @@ -173,7 +174,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please choose a password for the system \ administrator (\"root\").") (G_ "System administrator password") - #:input-hide-checkbox? #t)) + #:input-show-checkbox? #t)) (confirm-password password run-root-password-page))