From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eM1ODLdN2WXfUgEAqHPOHw:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eM1ODLdN2WXfUgEAqHPOHw (envelope-from ) for ; Sat, 24 Feb 2024 03:00:23 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=kaPS6VvR; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708740023; 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-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=yPntNySb0D++2qL5CYrYmRLmZ+r5LG2IvCJcrU8PniE=; b=VeJ2ahuxRyOlXsHZAHdwL0BMw01G0E3nDRpz7VERB5wW5Svoxid1o+Nk2UBtd5+5cahq/b eIUayrD8WAUcGl8+8JYz+we6FtkN7NaSenv96jtgcDAoTvdU8WNPFTbLoogZdWvuNoE9xs Eq1H0+wcvAa4O93Iwg8c+WRXmIZ+B1y3zBMU02ttfBybYRBPmxNvcYLkxImDCixAf0GBDm HaJxpTpTHY3IekCT+CHnBiGSVZA5DFNaIhUwjwBTJWF9vHIhDQK8i5FkCUlqxis9BsJbp8 pI3NbzP/jLMwSYVU7UP/i3AiNyl684ZSSGrfeuMPDFcgmjIvgCmko4ploDF1Cw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=kaPS6VvR; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708740023; a=rsa-sha256; cv=none; b=VfzGPZwbyLtMPSS8+hwUEr6rKxCVoBV/5lFjbRz+akQzD/NV8dwHQV6KX7XAQNq2KVvGpG IxWqSyf/iGr3ozYtLRg1lFaZk3qwCJtzyoFoiKtPFuJhvYVuMQrF+JWiOeviD/ClJrQq3E 9006fHnGVq/u/k/+j3XBzzxjpEekFhMbaXhMsQz4cmaqB0KyVlbFU1qCbWGj2hSEueCmIx 5PCP09h6yYSfIOadwv7hM0q8g1Eq0fk7ADD3MnyHVFsNUN+ifdUL2BPlnUvqeaIovCCcu3 lE0RG2aahTaf2hgxp5pyRyNF5HTFGdn5x9WWWKEOZhb4ow0n5H+AeA4vbe+ySA== 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 1EF593AC22 for ; Sat, 24 Feb 2024 03:00:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKV-0004VU-H0; Fri, 23 Feb 2024 20:59:55 -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 ) id 1rdhKK-0004Qf-Bc for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:45 -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 ) id 1rdhKJ-0006l6-DY; Fri, 23 Feb 2024 20:59:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKd-0003e0-HX; Fri, 23 Feb 2024 21:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 01/12] Fix bug where the extra menu entries for a bootloader were shown twice. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" 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: Sat, 24 Feb 2024 02:00:03 +0000 Resent-Message-ID: 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 , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.170873995313765 (code B ref 69343); Sat, 24 Feb 2024 02:00:03 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:13 +0000 Received: from localhost ([127.0.0.1]:36539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJo-0003Zp-5E for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:12 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:37576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJh-0003YB-8Q for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=EFWZ6M0fHdrIxDF yhRF0gEG8ruIshyAhIa7hcTQka/E=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=kaPS6VvRJVNh+gT/uGZXn0kr5pD0XkTIlRmjsgWd lD0EsGTgpKzSaA6Qk0dTHsmASFq0hp+DfnwnqJkc/xjW9msKkTT8v5w9U2lgU2jUKwa8b+ 3wfBHbhdaSgpdI2jYqgWxi8eckX5bi8zVt0BuSDseYLTdDpdHmGW80n1xPyyI= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id c1670776 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:55 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 057730c4; Sat, 24 Feb 2024 01:51:55 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:34 -0800 Message-ID: <25f1480b74f37095077b2cbbb8b0a169a272365d.1708736440.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.77 X-Spam-Score: -4.77 X-Migadu-Queue-Id: 1EF593AC22 X-Migadu-Scanner: mx11.migadu.com X-TUID: uacLTOA6d/e5 The extra menu entries are already being added in each bootloaders, as applicable. --- guix/scripts/system.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 -- 2.41.0