From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wHcXM+HJr2bGFgAAqHPOHw:P1 (envelope-from ) for ; Sun, 04 Aug 2024 18:35:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wHcXM+HJr2bGFgAAqHPOHw (envelope-from ) for ; Sun, 04 Aug 2024 20:35:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=HmKaJk2+; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=RsJVC18R; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=F9hXolZN; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722796513; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=t3putvifLmBtxRMBIO2MkhAQkvsLpbOrET+GfLPM8+U=; b=nfhRScGxRNgj8qcEebrQ0ldcA/2apoXE6zyasjr1wdmzYQEGfPrOb2Fi52gwQt2ADzYMe1 NjrvpCAS/1UzYEJEApDIqUSBNH7ymo5mpywF/mf6HTgl/AnyQg8RDkV+VpAQah+eq3Eblz 0W7Djeuk7txFywZj34neIzG/r0ZVifXQkOb+bK+4sdnsJdBV3YyscytPpS51TFZ5hzA6+E m//gxamQfGGoMRKi2Leo2snACNM/r/exGfwhpRzTzRKftBocKGQbG0bifoEcUail+yuGGe +6Li42olqqajgm3kDrrm71KolZ7EGdElv/NKYmRuSlYFm5GY4UHvzMZdEC+/7g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722796513; a=rsa-sha256; cv=none; b=K9JEDmkMavTlDt2qFDBiprGOuxUr6VRJARoYoQM6zTqzZ5tX4NPfM/8+byTIwdzFjP3vqq 4u5dj+qhboRe4W1fRoZdZJlon/evmbamN+XZUwGudripPlvum/GNwp6lQS/IonmMtTDPAB HThvCvZF6T8RKGNXCVYV/fRLxcFaJ4Sm1ybZmxrP6HfXJstf3fsIlzyL9lhzpUWldPNuhj wJmQikbQV9K2paVPoR9svWAtP39zbWccqSuBjcW7U7k4Wi/QtmPfhIu7C/eZxcjPw6gt/L kynhoa1rPg7zA39WpOXr8KsDz3Dm0EWVQ2F/vTO5rUBGz89wbdXvP0oyXhtmGg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=HmKaJk2+; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=RsJVC18R; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=F9hXolZN; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 985BB66305 for ; Sun, 4 Aug 2024 20:35:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1safnm-0002AA-KT; Sun, 04 Aug 2024 14:17:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1safnc-00026T-TN for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:45 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1safnb-0001qm-Lo for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=t3putvifLmBtxRMBIO2MkhAQkvsLpbOrET+GfLPM8+U=; b=HmKaJk2+DtaqqEyE0C8G8XKXyOsyyYfz/IRhGGbVbiB3PyWlUhOw5Toz3ouirkaQCYtHWctjNqKU6bptD+LaX1gtWGr+BMyLAJAUj31djKgw/SAMj+Ons//OrHuvpmqK79A8koIXagv/Li6FkIa2tqrJcHFDCK8sD4tfEtA5JX/ssuokgObu4VSvwN+wUmdLbeb9sLT5HWMHXQtQ/MUaKFZ6IFgj8grQcWYDc19Q0rzkfv1Luh/n52DCVaC3Ta8RGF0gzfr45V7BCeCFSd92Ioz0/4V//ndaJ5Zn/whMBWHx7mJY4gtAnja5QvJmLCX3NlKp5HdmKh1oGdtps/p1bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1safnw-00069P-To for guix-patches@gnu.org; Sun, 04 Aug 2024 14:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v2 05/15] gnu: system: Remove useless boot parameters. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 18:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72457@debbugs.gnu.org Cc: Lilah Tascheter , Tomas Volf <~@wolfsden.cz>, Sergey Trofimov Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172279545023268 (code B ref 72457); Sun, 04 Aug 2024 18:18:04 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 18:17:30 +0000 Received: from localhost ([127.0.0.1]:57162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnN-000634-K4 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:30 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:42588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnL-000623-Tt for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:28 -0400 DKIM-Signature: a=rsa-sha256; b=RsJVC18Rrp0m8PIAxI/NWZ9C56GZTMszOu9WETYJH7uDttbQeJMapZpTrjW8/4plq02pFMIZ50gD5iBfnNvLwL6/zSbp8iT4RWEXwKpFwTkYR1Ei0FoqxUb6kSRl+a/Oid2TJl+O9E6WA4+LNFUlSPysJwNzX6wQtT5D8BoIcr5bEKCB+V4AI2oBPhqtMHxuae9ql8CSJI+jkOXQ9gja1RyBiGjgrd+79bbHu1n0OrIwT65keTMBhTqUOHwxvS+yRil2gn+oZUd1RHA5mT6ApAiAAvtjpUfNmcLnEEKd+bJgy+/2tAR1P9jQJopVBdbpI69A4TbRoRDkvHmwYb0uzg==; s=purelymail2; d=lunabee.space; v=1; bh=ol1uWhvcd6jg8jrl+jAW7wdPNF/rhebpv51yL/ZJ3vU=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=F9hXolZNRv369Tw7/7eKMOMNk0j1Im0JIj1nVczisqAklqFe0xtWlAQIOV9CRGzDFXuc89MgutpHyLQX7u2ZL8kC0SaS3ru4ZoQkxihnIkEtLUofQtIh5DJkL6122g6PuBe4Nc0CMuevzW4xaz3N7uEByKEYEJtufETXLKJMpfnL2obBapd3N+rdInZJboK1u5z/CItOQAAYIf22Ymd+bhGgbmpd2jQiCdp6dQABoKEYwEV4qklZv5QR2Gs3abS/lzDqHZjTOmlqphuo3MqpFMGOeoLFut34r1NiB9fcqqKe34SfW64V1hVwQDy8gr3883V4eglOn8EePM76sYvlRg==; s=purelymail2; d=purelymail.com; v=1; bh=ol1uWhvcd6jg8jrl+jAW7wdPNF/rhebpv51yL/ZJ3vU=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72457@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1097091497; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 18:16:46 +0000 (UTC) Date: Sun, 4 Aug 2024 13:06:04 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 985BB66305 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: X0uVOUsgIOSi * 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 --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-de= vice (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 param= s))) #~()) (bootloader-name #$(boot-parameters-bootloader-name p= arams)) - (bootloader-menu-entries - #$(map menu-entry->sexp - (or (and=3D> (operating-system-bootloader os) - bootloader-configuration-menu-entr= ies) - '()))) (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* ;; partition. (root-device boot-parameters-root-device) (bootloader-name boot-parameters-bootloader-name) - (bootloader-menu-entries ;list of - 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. =20 - (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 o= f ;; the absolute file name of its image. Detect that and correct it. (kernel (if (string=3D? 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))) =20 @@ -170,7 +166,6 @@ (define* (test-read-boot-parameters =20 (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))) =20 -(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 --=20 2.45.2