From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kHeiIyKf7madDwEA62LTzQ:P1 (envelope-from ) for ; Sat, 21 Sep 2024 10:25:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kHeiIyKf7madDwEA62LTzQ (envelope-from ) for ; Sat, 21 Sep 2024 12:25:38 +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=NVxqldCC; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=QtsIxlfs; 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=1726914338; 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=22xZr3cHfQUyuzJYjWynaHwwBCCVcboHbtjihFzfiuc=; b=dVvKXpEB5AYOgY1dnCCbrS3ROJ2SN+bohtHHDIaCcMllp81yReCxO2gGMhG56oqFK5/OL4 Loc5WTBkf++gkxpe5gb/CDX2EmDNwdPpR/LJH5N2wMya0ZyVIoEspZV3wdTDRKhMOhXiDy wqlMWKtoE6DoUcdb7XtbTclfAPmc8G+OGDR3SI/n+YQwg9FSDOmHYZn6qq29NwgxBafpIY OXdpItAt5r6HALI1K8BEBdS7ZP0aBLrOX4qHJieWe/Bpa/+p6FIhCSF6T1tP5y/rffHWAz 0qbAcndaFuehvJ7+qEsuCaQ0RdDRkOfIqZDqDE+JCHWIKGGl8mJ4U4N7HSdtHA== 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=NVxqldCC; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=QtsIxlfs; 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=1726914338; a=rsa-sha256; cv=none; b=mrs+SVw3I29vQk2i0RBeYg/OXUnW70g6pr80lHLuVhC4q/TWLHQ36N5uVLckdz6hANHo7Y MFs7oJaqztCQTl5eLk8FUmF3ytnAcIcVR8dg/vV6KSSmAbiCuwI73gMoRdRaG2oUvytvfe c13gjs6NPelHib77QovEpuT1BKrtHd27skvsfRVu/IkEqY/dqVSW49XnNJDC4HUzaZMPdf E19EItHMKfcvZuEwvDLa0/Hu6HEZ5zNzhMmreKD+piABmVbJ4SzzCN2dsUZSts6gaZcn9C aUZjMTTp5+TetqmKow5OlXgdcIbGZqYyLW+bpRJGGWtHAzFO+bj59LRgXQGn6A== 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 7E33D68B45 for ; Sat, 21 Sep 2024 12:25:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srxID-0008Vx-TP; Sat, 21 Sep 2024 06:24:45 -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 1srxIC-0008VE-56 for guix-patches@gnu.org; Sat, 21 Sep 2024 06:24:44 -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 1srxIB-0004cK-Fg; Sat, 21 Sep 2024 06:24:43 -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=22xZr3cHfQUyuzJYjWynaHwwBCCVcboHbtjihFzfiuc=; b=NVxqldCCvotSgs571G1S7o3I2hQloU6zjb/OjO1Idjt3+xGhg8IfCDmmAZXwK/CT7dybjERIU5H5iQWbY56fj0SFZfdscGZMbMxD6sq0PTFjGqH61XKGpUFu/cvosNkxkDOgVtzbxvbwewBshSfU8a8Fc8JS6phM9xxCp95q6olKG92uCXIju8NHDSa14K2p7Gz9o7P+3bQ6ErpMjojIEkRqKv+HgHlfKPW0muF0DYINjiQ5x2YYxJ3a+j2R6Mn0u45d3YaPazMlMv2vpsAdYKIvcRj5DBsFYKXG4NAGcXqPnHVEkARiV0ZnloFbY1JADJbdTqmedFknaPpmL1qJfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srxIV-0005oY-0E; Sat, 21 Sep 2024 06:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v5 01/10] Fix bug where the extra menu entries for a bootloader were shown twice. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" 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: Sat, 21 Sep 2024 10:25:02 +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 , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.172691428822248 (code B ref 69343); Sat, 21 Sep 2024 10:25:02 +0000 Received: (at 69343) by debbugs.gnu.org; 21 Sep 2024 10:24:48 +0000 Received: from localhost ([127.0.0.1]:37283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srxIF-0005ma-U4 for submit@debbugs.gnu.org; Sat, 21 Sep 2024 06:24:48 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:57083 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srxIA-0005li-LB for 69343@debbugs.gnu.org; Sat, 21 Sep 2024 06:24:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1726914251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=22xZr3cHfQUyuzJYjWynaHwwBCCVcboHbtjihFzfiuc=; b=QtsIxlfs+h3rUqdaXcwSl9iTPC87RAsSbPoNLDry8j7NG9N76vWRGEQrLyX/YDhya1/3M5 l6Q+1yIvHlAa5wHJwBSgqBObHkJoysYA1rNXt2zazyEQ4JGaa6rS3ez0AeM7dkOSkVzAOG icDRv5NRYtb07VxR2iRMxKfLSNh5ZnhJUXuIaU+i85m2xhBRkEJpfp+PMUPKJZiNQBzasO 6V4J54jTE433HnyMCp5TNaKHv66Wae3lXpA/3blzxcvgIRkvnIcGdrfahYI/nmT83lCNvU 6rxq9zxQvu3iAujf+2zbVb+VxEwAwMDKzqCwWWaGFjB6sJgZ1yw0UdYQGBmFtg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b7c4536d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 21 Sep 2024 10:24:11 +0000 (UTC) Date: Sat, 21 Sep 2024 12:23:14 +0200 Message-ID: <485412da830c8b9a6d4ad4d98aec168eba9a6a3a.1726913452.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 7E33D68B45 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.01 X-Migadu-Spam-Score: -5.01 X-TUID: EPB98KCCnnkP From: Felix Lechner 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(-) 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 -- 2.45.2