Package: guix-patches;
Reported by: Herman Rimm <herman <at> rimm.ee>
Date: Thu, 12 Sep 2024 17:00:02 UTC
Severity: normal
Tags: patch
Fix blocked by 69343: [PATCH 00/12] Simplify bootloader data structures and procedures
Message #71 received at 73202 <at> debbugs.gnu.org (full text, mbox):
From: Herman Rimm <herman <at> rimm.ee> To: 73202 <at> debbugs.gnu.org Cc: Lilah Tascheter <lilah <at> lunabee.space> Subject: [PATCH v3 02/14] gnu: system: Remove useless boot parameters. Date: Thu, 26 Sep 2024 12:08:59 +0200
From: Lilah Tascheter <lilah <at> lunabee.space>
* gnu/system.scm (operating-system-boot-parameters,
operating-system-boot-parameters-file): Delete bootloader-menu-entries.
* gnu/system/boot.scm (boot-parameters)[bootloader-menu-entries]: Delete
field.
(read-boot-parameters): Don't read bootloader-menu-entries.
* tests/boot-parameters.scm (%grub-boot-parameters,
test-read-boot-parameters, test-read-boot-parameters): Don't include
bootloader-menu-entries.
("read, bootloader-menu-entries, default value"): Delete test.
Change-Id: I46d9cff4604dbfcf654b0820fdb77e72aecffbb4
---
gnu/system.scm | 7 -------
gnu/system/boot.scm | 8 --------
tests/boot-parameters.scm | 18 +++++-------------
3 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 25afa96295..a3eee5aa24 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1298,8 +1298,6 @@ (define* (operating-system-boot-parameters os root-device
(initrd initrd)
(multiboot-modules multiboot-modules)
(bootloader-name bootloader-name)
- (bootloader-menu-entries
- (bootloader-configuration-menu-entries (operating-system-bootloader os)))
(locale locale)
(store-device (ensure-not-/dev (file-system-device store)))
(store-directory-prefix (btrfs-store-subvolume-file-name file-systems))
@@ -1341,11 +1339,6 @@ (define* (operating-system-boot-parameters-file os)
#$(boot-parameters-multiboot-modules params)))
#~())
(bootloader-name #$(boot-parameters-bootloader-name params))
- (bootloader-menu-entries
- #$(map menu-entry->sexp
- (or (and=> (operating-system-bootloader os)
- bootloader-configuration-menu-entries)
- '())))
(locale #$(boot-parameters-locale params))
(store
(device
diff --git a/gnu/system/boot.scm b/gnu/system/boot.scm
index de312c7208..54e5673a54 100644
--- a/gnu/system/boot.scm
+++ b/gnu/system/boot.scm
@@ -51,7 +51,6 @@ (define-module (gnu system boot)
boot-parameters-label
boot-parameters-root-device
boot-parameters-bootloader-name
- boot-parameters-bootloader-menu-entries
boot-parameters-store-crypto-devices
boot-parameters-store-device
boot-parameters-store-directory-prefix
@@ -110,8 +109,6 @@ (define-record-type* <boot-parameters>
;; partition.
(root-device boot-parameters-root-device)
(bootloader-name boot-parameters-bootloader-name)
- (bootloader-menu-entries ;list of <menu-entry>
- boot-parameters-bootloader-menu-entries)
(store-device boot-parameters-store-device)
(store-mount-point boot-parameters-store-mount-point)
(store-directory-prefix boot-parameters-store-directory-prefix)
@@ -172,11 +169,6 @@ (define (read-boot-parameters port)
((_ args) args)
(#f 'grub))) ; for compatibility reasons.
- (bootloader-menu-entries
- (match (assq 'bootloader-menu-entries rest)
- ((_ entries) (map sexp->menu-entry entries))
- (#f '())))
-
;; In the past, we would store the directory name of linux instead of
;; the absolute file name of its image. Detect that and correct it.
(kernel (if (string=? kernel (direct-store-path kernel))
diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm
index 2e7976aa6c..e1dc4620c3 100644
--- a/tests/boot-parameters.scm
+++ b/tests/boot-parameters.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835 <at> gmail.com>
;;; Copyright © 2022 Josselin Poiret <dev <at> jpoiret.xyz>
+;;; Copyright © 2024 Herman Rimm <herman <at> rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,7 @@ (define-module (test-boot-parameters)
#:use-module (guix gexp)
#:use-module (guix store)
#:use-module (guix tests)
+ #:use-module (ice-9 format)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-64)
#:use-module (rnrs bytevectors))
@@ -64,7 +66,6 @@ (define %root-path "/")
(define %grub-boot-parameters
(boot-parameters
(bootloader-name 'grub)
- (bootloader-menu-entries '())
(root-device %default-root-device)
(label %default-label)
(kernel %default-kernel)
@@ -107,7 +108,6 @@ (define* (test-read-boot-parameters
#:key
(version %boot-parameters-version)
(bootloader-name 'grub)
- (bootloader-menu-entries '())
(label %default-label)
(root-device (quote-uuid %default-root-device))
(kernel %default-kernel)
@@ -127,7 +127,7 @@ (define* (test-read-boot-parameters
(cond ((eq? 'false val) (format #false fmt #false))
(val (format #false fmt val))
(else "")))
- (format #false "(boot-parameters~a~a~a~a~a~a~a~a~a~a)"
+ (format #f "(boot-parameters~@{~a~})"
(sexp-or-nothing " (version ~S)" version)
(sexp-or-nothing " (label ~S)" label)
(sexp-or-nothing " (root-device ~S)" root-device)
@@ -135,7 +135,7 @@ (define* (test-read-boot-parameters
(sexp-or-nothing " (kernel-arguments ~S)" kernel-arguments)
(sexp-or-nothing " (initrd ~S)" initrd)
(if with-store
- (format #false " (store~a~a~a~a)"
+ (format #f " (store~@{~a~})"
(sexp-or-nothing " (device ~S)" store-device)
(sexp-or-nothing " (mount-point ~S)"
store-mount-point)
@@ -145,9 +145,7 @@ (define* (test-read-boot-parameters
store-crypto-devices))
"")
(sexp-or-nothing " (locale ~S)" locale)
- (sexp-or-nothing " (bootloader-name ~a)" bootloader-name)
- (sexp-or-nothing " (bootloader-menu-entries ~S)"
- bootloader-menu-entries)))
+ (sexp-or-nothing " (bootloader-name ~a)" bootloader-name)))
(let ((str (generate-boot-parameters)))
(call-with-input-string str read-boot-parameters)))
@@ -170,7 +168,6 @@ (define* (test-read-boot-parameters
(test-assert "read, construction, optional fields"
(and (test-read-boot-parameters #:bootloader-name #false)
- (test-read-boot-parameters #:bootloader-menu-entries #false)
(test-read-boot-parameters #:kernel-arguments #false)
(test-read-boot-parameters #:with-store #false)
(test-read-boot-parameters #:store-device #false)
@@ -223,11 +220,6 @@ (define* (test-read-boot-parameters
(boot-parameters-bootloader-name
(test-read-boot-parameters #:bootloader-name #false)))
-(test-eq "read, bootloader-menu-entries, default value"
- '()
- (boot-parameters-bootloader-menu-entries
- (test-read-boot-parameters #:bootloader-menu-entries #false)))
-
(test-eq "read, kernel-arguments, default value"
'()
(boot-parameters-kernel-arguments
--
2.45.2
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.