| Message ID | 8dc29d9f104ed8b62c7b952b5dcc99de8c216c8a.1709885528.git.lilah@lunabee.space |
|---|---|
| State | New |
| Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F067127BBE2; Fri, 8 Mar 2024 08:26:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 858CD27BBEA for <patchwork@mira.cbaines.net>; Fri, 8 Mar 2024 08:26:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1riVXz-0003xd-ME; Fri, 08 Mar 2024 03:25:43 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1riVXr-0003u1-F1 for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:36 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1riVXn-00017j-TY; Fri, 08 Mar 2024 03:25:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1riVYH-0002d8-R6; Fri, 08 Mar 2024 03:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v2 01/12] Fix bug where the extra menu entries for a bootloader were shown twice. Resent-From: Lilah Tascheter <lilah@lunabee.space> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 08:26:01 +0000 Resent-Message-ID: <handler.69343.B69343.17098863129829@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Felix Lechner <felix.lechner@lease-up.com>, Christopher Baines <guix@cbaines.net>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic Court??s <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Ricardo Wurmus <rekado@elephly.net>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr> X-Debbugs-Original-Xcc: Christopher Baines <guix@cbaines.net>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic Court??s <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Ricardo Wurmus <rekado@elephly.net>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr> Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.17098863129829 (code B ref 69343); Fri, 08 Mar 2024 08:26:01 +0000 Received: (at 69343) by debbugs.gnu.org; 8 Mar 2024 08:25:12 +0000 Received: from localhost ([127.0.0.1]:56366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1riVXU-0002YP-AU for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:12 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:50346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lilah@lunabee.space>) id 1riVXR-0002Xf-Of for 69343@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:11 -0500 DKIM-Signature: a=rsa-sha256; b=pdcFJh5Fc8pKi2pNnxOxq5vAZFLBnShAyu4z1xS8PUwIDq45BBpiPSLlS6cMYZHWjSG3oaEtPfJbkKQUWRbw2z+lpVlp1J+LNiskJEFuXBKXJLgLw1w3D/I1dEtJ2ei3g/mS58AyMJv4zBjIyWnVgPEE50zxoCDYtblbD1IoXCD3igUqIGf97W7AzSYs75bdia6iYIWeEvyGEXz3kHW68/47ihDfEm/QdWSXss/4QxSXluEQ3Zzwg009OjkIQCLEYkoCA/XT4Zi5fIxUTL4KyZRPBhwm1A/SbIE9hRrIejKRAha6m+EHvdanv6XlJF8ayaUPj0mpJnVCitm4UJzCog==; s=purelymail2; d=lunabee.space; v=1; bh=fCEMsAZDlsjjuNAiHe2ZCGN4mX7EqE0z1rJPWXBnl3o=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=KS1khdGaxkbH2I0kmQ/I2NB05kcxslg8Zl5T5oDQsSTBqQAowMUcL0WRd9rGNb6lOU0utJPRLjQ0SsJlyCQIqE+E8O+H46UX2W4648tDAzPAG3/v62ezCnOlVYDTlwNg2lj0Ds5z8K8O1t31WZrN73rimPWmuCZKfyiO9DZh4fVKqZIF8ysW59EJ24OofRAMECUap9vUgHDLYJIU5dPxDKfttUwhDVhVHDCcv5Xw9x1U87aEmSE7Tn8JxwOsaLw/SDN0fYMLFu8LBStTRkipKo7dl8YFZvI299+wCMtkTthXGGYQCwkV5joSje30rCD5VNZs09bz8LOrX570TMe0Kg==; s=purelymail2; d=purelymail.com; v=1; bh=fCEMsAZDlsjjuNAiHe2ZCGN4mX7EqE0z1rJPWXBnl3o=; h=Feedback-ID:Received:From:To:Subject; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 69343@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 637763825; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 08 Mar 2024 08:24:16 +0000 (UTC) Date: Fri, 8 Mar 2024 02:11:57 -0600 Message-ID: <8dc29d9f104ed8b62c7b952b5dcc99de8c216c8a.1709885528.git.lilah@lunabee.space> In-Reply-To: <cover.1709885528.git.lilah@lunabee.space> References: <cover.1709885528.git.lilah@lunabee.space> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> From: Lilah Tascheter via Guix-patches <guix-patches@gnu.org> Reply-To: Lilah Tascheter <lilah@lunabee.space> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
| Series |
Simplify bootloader data structures and procedures
|
expand
|
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bf3d2f9044..955dfa618d 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -407,8 +407,7 @@ (define (reinstall-bootloader store number) (delv number (reverse (generation-numbers %system-profile)))) (old-params (profile-boot-parameters %system-profile old-generations)) - (entries (cons (boot-parameters->menu-entry params) - (boot-parameters-bootloader-menu-entries params))) + (entries (list (boot-parameters->menu-entry params))) (old-entries (map boot-parameters->menu-entry old-params))) (run-with-store store (mlet* %store-monad
From: Felix Lechner <felix.lechner@lease-up.com> The extra menu entries are already being added in each bootloaders, as applicable. * guix/scripts/system.scm (reinstall-bootloader)[entries]: Don't extraneously include bootloader-configuration-menu-entries here. Change-Id: I8a600f2a5836ab4f7db5e27e25b0b8f432c3e1e0 --- guix/scripts/system.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)