| Message ID | 048a294013321d432030a71007d7386d2f1308d7.1722741214.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 8193227BBED; Sun, 4 Aug 2024 04:17:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E895427BBEE for <patchwork@mira.cbaines.net>; Sun, 4 Aug 2024 04:17:44 +0100 (BST) 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 1saRjv-0003mI-Pl; Sat, 03 Aug 2024 23:16:59 -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 <Debian-debbugs@debbugs.gnu.org>) id 1saRji-0003k6-8q for guix-patches@gnu.org; Sat, 03 Aug 2024 23:16:46 -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 <Debian-debbugs@debbugs.gnu.org>) id 1saRjh-0002NW-9t; Sat, 03 Aug 2024 23:16:45 -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=2ZG/xzlaJZwVvFpWrIC7p3e3sUtcoH68qb3lRbMLAhU=; b=JwSY2q1Hp+UFQYiY0VPEZI8gQp7fMTbPqIbc9Dr7082NeChgSG8ILZuu90lOEpdbZP3BD3My7SnANhA9z5d9nDSbCJAvnWBcjVdxGQlwx32BOMo3ZM71tpmgbBR63B+D5R4XAZRIAxldfo3OP2c/mBBoUux7sjv8+jGl/lpTnIA6/W4m+JNR4RRXt/snE/It/Bn2yQC8nEmiQTgq1Ub0JQpMwycGY+1QveEVXFEPPnbPUG14XnWe5zCqPdEAbMt7X68CxG2LKFVr+KrKIz/1pHtL7mDrdCaWpnHNZ4eyWP3bWqs/AmhNgSSPUnknzRhS6+I+FRoo1Ot7nvkJ0hhMKg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1saRjy-0007n1-Vk; Sat, 03 Aug 2024 23:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v3 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, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 03:17:02 +0000 Resent-Message-ID: <handler.69343.B69343.172274136829616@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>, 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>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr> Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.172274136829616 (code B ref 69343); Sun, 04 Aug 2024 03:17:02 +0000 Received: (at 69343) by debbugs.gnu.org; 4 Aug 2024 03:16:08 +0000 Received: from localhost ([127.0.0.1]:54982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1saRj5-0007hX-L7 for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:07 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:56494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lilah@lunabee.space>) id 1saRj3-0007ge-43 for 69343@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:06 -0400 DKIM-Signature: a=rsa-sha256; b=HX0fVzAs5xOV34TRNun+64UaDPkqDNXmYM9EjEuno8BM7iHQtezOPRGm496bgLgXZNHOrwdo8aftpxPlAGvYipfyPuBA0kgFEa33DUg+mJwK71VJELT4sb+oxJJ7P9LAjVQBLfZyIV52wnAZA4j9GtsQqcl/CVjDlsxQpHowXiRClqD0aH6/VTfNUeKTYAqSQu9OCTzbCOo1Yr/S8FKObKcEFu9VHYGr1wHBd3c0HtOSe/8nMchYg9xN6XLEOqp5zhJif/Qobt2040upy4RApQ3HwPnJc+gqA6FB4dWggUxYFR8HpBcjVD30syy3WPRDLaRkFXV0Tf8s/+TJ/UKeFA==; s=purelymail2; d=lunabee.space; v=1; bh=qXWn1cz6zN65+Q68ygAxFMhzoQIb60JNk1LL8A3ilhs=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=Ymjeoj9Jm14DJFP4EBzK1dnPTb9ym2vxm7IH9FQaaCxfCnupBBlTGJFfhYFQHJZv//T09kaiXFZa1+Od7GAcSX8/V+RyZOIPuIseU6ggIywS4sbw3327sRtzy665xoNqH0GlhHuJXhYeK4hCB24K1XGvs9q20LXyhF+Ljx393c1RdE7Skt6Y2fwFhPr+vbH4zWA/ufGQ+Ozb5RAzvV1nYlUdwaw/aP0kJIViDGnwBDtwvXP6MwH0QBF7lbb7QDz8auq1Dh71HhV76geHgzrEADZKqIkPYPLpvuQeRusd0qFCw7mWgeRSl3E2B8p0gncBNgBQ6tMfSlhvGfORA+c5fQ==; s=purelymail2; d=purelymail.com; v=1; bh=qXWn1cz6zN65+Q68ygAxFMhzoQIb60JNk1LL8A3ilhs=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 69343@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -2124817350; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:15:35 +0000 (UTC) Date: Sat, 3 Aug 2024 22:13:23 -0500 Message-ID: <048a294013321d432030a71007d7386d2f1308d7.1722741214.git.lilah@lunabee.space> In-Reply-To: <cover.1722741214.git.lilah@lunabee.space> References: <cover.1722741214.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 99c58f3812..0305128763 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -412,8 +412,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(-)