| Message ID | 048a294013321d432030a71007d7386d2f1308d7.1726805765.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 70A1427BBE2; Fri, 20 Sep 2024 05:18:13 +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 5A4B827BBEA for <patchwork@mira.cbaines.net>; Fri, 20 Sep 2024 05:18:12 +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 1srV5a-0008CK-E3; Fri, 20 Sep 2024 00:17:50 -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 1srV5W-0008B9-6R for guix-patches@gnu.org; Fri, 20 Sep 2024 00:17: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 1srV5V-0006FT-7h; Fri, 20 Sep 2024 00:17: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=twBSxO8OYtv7Y0YpuY4Yq5bn1AJZ/T1jWxLM2EXy96q9BDSDLgo1flD9/G5IsTiHoF7QksRsxlx0I8jDkTIbC9p9gP0s8SKDa123Wr/4HDvE2rY44g9TNVFmGYYTfI4V4IZDWt3x7+yVlTyM0KQTP+juSTi9HS0xPntBbrpohb76vYZzer/Ja60BtdlPuraCOqxs0cxtAD9zxuOEcigJfe+8c7kawzVMR3VXx5vaXQS7Or34EyCZr6EJINhl6kYGfyNwic3li4pIph9eWVU6XTh3OXPgcJuHXh6Sd6Kkez+md/256vbK8dwN3JY8T1pLJntTGp8paxXpIyds/2NeRA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1srV5m-0005T1-FA; Fri, 20 Sep 2024 00:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v4 01/11] 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: Fri, 20 Sep 2024 04:18:02 +0000 Resent-Message-ID: <handler.69343.B69343.172680585620863@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: Herman Rimm <herman@rimm.ee>, 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.172680585620863 (code B ref 69343); Fri, 20 Sep 2024 04:18:02 +0000 Received: (at 69343) by debbugs.gnu.org; 20 Sep 2024 04:17:36 +0000 Received: from localhost ([127.0.0.1]:33723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1srV5M-0005QQ-3H for submit@debbugs.gnu.org; Fri, 20 Sep 2024 00:17:36 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:49144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lilah@lunabee.space>) id 1srV5K-0005Q0-4I for 69343@debbugs.gnu.org; Fri, 20 Sep 2024 00:17:34 -0400 DKIM-Signature: a=rsa-sha256; b=awliK9Fzrvgq3UnS44kefL4JfzLACfXV9qlNY5gK0awpFnZTZz3fBswkKmMkFkH20gGvTGe6dET2kFnGBfbRm+GlJgkcPexggUbfIL+NnQ0x0m0Jgnc3dz321OnuCWpegb1V6iXtMOQ6CTdsN+y5mspDw6rTxzccmYiwYBMrCjK0D0RwyXYsbEpFz7HSGrmWixSurpjCTYLL9Pzyi7+jkQxqa5vuIwJxR8gDvRYsnlBXh9avYDKhGMZYt0sjWnSLS0hPVVTSCECMYpRojmz2HyI1Oj3rf3jlyH1cw54xSLZ7KPIlYFmbPEtXFMA75cFit02LCUFCzAyYYz1PRgcmLA==; s=purelymail3; d=lunabee.space; v=1; bh=qXWn1cz6zN65+Q68ygAxFMhzoQIb60JNk1LL8A3ilhs=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=iljA4SzUGUnnbXQoVY9hu2NfHeR3nCeMMgDNdoNP+kQBn0WLF0Px5lhUcX58+97zy92kiBq1k08V/49Tjec15bJrcVU4hbTQN/2WJPc/EEDrD5wZb5UPiFf5CTwIiB7qmymUpEUUmsVM9Aj22i80HbCbYCBhfLkbLEXB6+DO6qwrY5opzCbOihykzfvzDasesVh67GXHV6/lCxb4zq5FndWqmmwCf0aX6lcNVYcCuRCbej3nmmLIVH6J/ak83864Dxu6KkChJ27tjGwEKHB8N1w1CUP6h0cF+gWcKGT1LKE0AAr/4jiJUXfiCZBDv7ElpGWxsH0R+Tss80Ecd4kdHA==; s=purelymail3; 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 -100958845; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 20 Sep 2024 04:17:09 +0000 (UTC) Date: Thu, 19 Sep 2024 23:15:55 -0500 Message-ID: <048a294013321d432030a71007d7386d2f1308d7.1726805765.git.lilah@lunabee.space> In-Reply-To: <cover.1726805765.git.lilah@lunabee.space> References: <cover.1726805765.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(-)