diff mbox series

[bug#72457,05/15] gnu: system: Remove useless boot parameters.

Message ID 74d8f8ec6ba3b49562bb339dd736f3ddb10f9400.1722741997.git.lilah@lunabee.space
State New
Headers show
Series Rewrite bootloader subsystem. | expand

Commit Message

Lilah Tascheter Aug. 4, 2024, 3:55 a.m. UTC 
* 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
  fields.
  (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 | 14 ++------------
 3 files changed, 2 insertions(+), 27 deletions(-)
diff mbox series

Patch

diff --git a/gnu/system.scm b/gnu/system.scm
index a345b52d55..66c1a80733 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1304,8 +1304,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))
@@ -1347,11 +1345,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 2b5302ce5f..4d89827ced 100644
--- a/gnu/system/boot.scm
+++ b/gnu/system/boot.scm
@@ -54,7 +54,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
@@ -113,8 +112,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)
@@ -176,11 +173,6 @@  (define (read-boot-parameters port)
          ((_ args) (list 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..f214de360d 100644
--- a/tests/boot-parameters.scm
+++ b/tests/boot-parameters.scm
@@ -64,7 +64,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 +106,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 +125,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 #false "(boot-parameters~a~a~a~a~a~a~a~a~a)"
             (sexp-or-nothing " (version ~S)" version)
             (sexp-or-nothing " (label ~S)" label)
             (sexp-or-nothing " (root-device ~S)" root-device)
@@ -145,9 +143,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 +166,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 +218,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