[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73927] [PATCH v3 11/17] installer: Use "partitioning-page" consiste
From: |
Janneke Nieuwenhuizen |
Subject: |
[bug#73927] [PATCH v3 11/17] installer: Use "partitioning-page" consistently. |
Date: |
Fri, 25 Oct 2024 11:40:03 +0200 |
Having `partition-page' function call `RUN-partititionING-page' where all
other proxy functions call `RUN-<name>' hurts my brain while refactoring.
* gnu/installer/record.scm (<installer>)[partition-page]: Rename to...
[partitioning-page]: ...this.
* gnu/installer/newt.scm (partitioning-page, newt-installer): Update
accordingly.
* gnu/installer.scm (installer-steps): Update accordingly.
Change-Id: I6b2f3459a3d0a7a89260224b7d8438676e3411ba
---
gnu/installer.scm | 3 ++-
gnu/installer/newt.scm | 5 +++--
gnu/installer/record.scm | 5 +++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 3dfcb7581a..3a05843cab 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -312,7 +313,7 @@ (define (installer-steps)
(id 'partition)
(description (G_ "Partitioning"))
(compute (lambda _
- ((installer-partition-page current-installer))))
+ ((installer-partitioning-page current-installer))))
(configuration-formatter user-partitions->configuration))
(installer-step
diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm
index e1c4453168..6d8ea35fff 100644
--- a/gnu/installer/newt.scm
+++ b/gnu/installer/newt.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -193,7 +194,7 @@ (define (hostname-page)
(define (user-page)
(run-user-page))
-(define (partition-page)
+(define (partitioning-page)
(run-partitioning-page))
(define (services-page)
@@ -220,7 +221,7 @@ (define newt-installer
(timezone-page timezone-page)
(hostname-page hostname-page)
(user-page user-page)
- (partition-page partition-page)
+ (partitioning-page partitioning-page)
(services-page services-page)
(welcome-page welcome-page)
(parameters-menu parameters-menu)
diff --git a/gnu/installer/record.scm b/gnu/installer/record.scm
index 5e0264682f..334af44a0c 100644
--- a/gnu/installer/record.scm
+++ b/gnu/installer/record.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,7 +38,7 @@ (define-module (gnu installer record)
installer-timezone-page
installer-hostname-page
installer-user-page
- installer-partition-page
+ installer-partitioning-page
installer-services-page
installer-welcome-page
installer-parameters-menu
@@ -86,7 +87,7 @@ (define-record-type* <installer>
;; procedure void -> void
(user-page installer-user-page)
;; procedure void -> void
- (partition-page installer-partition-page)
+ (partitioning-page installer-partitioning-page)
;; procedure void -> void
(services-page installer-services-page)
;; procedure (logo #:pci-database) -> void
--
2.46.0
- [bug#73927] [PATCH 14/16] installer: Add "Kernel" page to select the Hurd., (continued)
[bug#73927] [PATCH v3 00/17] Installer support for (cross) installing the Hurd., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 05/17] system: hurd: Add swap-services to hurd-default-essential-services., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 04/17] system: hurd: Remove qemu networking from %base-services/hurd., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 07/17] hurd-boot: Support second boot., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 03/17] bootloader: grub: Remove hardcoded partition number for the Hurd., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 02/17] guix system: When installing the Hurd, create essential devices., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 01/17] gnu: guile-fibers: Fix cross-build for the Hurd., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 08/17] maint: Add installer dependencies to the manifest., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 11/17] installer: Use "partitioning-page" consistently.,
Janneke Nieuwenhuizen <=
- [bug#73927] [PATCH v3 14/17] installer: Add dry-run?, Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 13/17] installer: Use `%' for parameter %run-command-in-installer., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 16/17] installer: Add static-networking template., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 15/17] installer: Add "Kernel" page to select the Hurd., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 17/17] installer: Support dry-run from Guile via store., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 06/17] gnu: hurd: Support second boot., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 09/17] installer: Remove unused (newt) imports., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 10/17] installer: Align comments., Janneke Nieuwenhuizen, 2024/10/25
- [bug#73927] [PATCH v3 12/17] installer: Fix file-name typos., Janneke Nieuwenhuizen, 2024/10/25
[bug#73927] [PATCH v4 00/18] Installer support for (cross) installing the Hurd., Janneke Nieuwenhuizen, 2024/10/30