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 ms8.migadu.com with LMTPS id YK6jJbDL6mU76wAA62LTzQ:P1 (envelope-from ) for ; Fri, 08 Mar 2024 09:26:24 +0100 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 YK6jJbDL6mU76wAA62LTzQ (envelope-from ) for ; Fri, 08 Mar 2024 09:26:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=pdcFJh5F; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KS1khdGa; 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=1709886384; 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-type:content-type: 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=Yu871OpfClS36/d53laPRFblwQQmx058lkGVxEGfJqY=; b=uHb9gqn/dsOSuH42gJ1V3T+Y0bXDlwmJmdTAaFINCW/rXFL1qnf+pkZ0JvrCfyl//7Picv ZV1X5Azf/kVmLsvQlOemwSgdMHsH+d5PJ+DoQxGY3t5AcbsY7WaiPn40I71uJORaMGolkx KmGKgKJyE0PO/ay76hjGVLuY6G3nlxHyRrSweqv7GD4kiguUiGlN6Fy8ITWE/va3x7x+wI Z6Mj+IVRPGbbo5Nm7V7itVoaTvI96DrpPPwTlD+lWjmMYVeT6Bofe14n0pyLJHdN26x2Lh j+Avyl5Seqf8dQnCtSYKp8SDHBKockjzaSmp13ZMOUS4B2mgZf6nIYZALlTw2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709886384; a=rsa-sha256; cv=none; b=JxeCPTq/R6A/Rn7EWpxcDGsiXV1BL4qB2zAoEj7GztXBOImEmsGArwR5/wVQGeRwfyx2ue lX/TplpJxdKoLlZbYXejRTg25DrQvbxrxpUd66MwNVKv2Duqtd3p/v5sqnXgFjk2C/BrxN 7GmWJQvHraR+JL1fXsMGEGGYq6NiyQ8Jk715ItLcIYpScZ0uSRINKUZbkbGoP1ZlhgvAEr rSWV9YkCmv52xT4rWajHHmKwZExtOabhGDHQtaSSJe8G6WUBDh9z7p3QSGb/zLPGUJPxNc o3S5q0aWc6Lzol8/Eq2Cv8EAwyUswBygtOuaL+KYES3dOqhBI+vSa1gOySXuxQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=pdcFJh5F; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KS1khdGa; 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 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 8666B42E21 for ; Fri, 8 Mar 2024 09:26:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 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: Fri, 08 Mar 2024 08:26:01 +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 Court??s , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic Court??s , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 ) 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 ) 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: References: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter 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-Spam-Score: -5.28 X-Spam-Score: -5.28 X-Migadu-Queue-Id: 8666B42E21 X-Migadu-Scanner: mx11.migadu.com X-TUID: S0wqCP498e1K 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 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 --=20 2.41.0