From unknown Tue Aug 19 02:59:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#56122] [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jun 2022 11:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56122@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165581034820983 (code B ref -1); Tue, 21 Jun 2022 11:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jun 2022 11:19:08 +0000 Received: from localhost ([127.0.0.1]:59249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3buV-0005SN-SY for submit@debbugs.gnu.org; Tue, 21 Jun 2022 07:19:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:42470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3buU-0005SF-Il for submit@debbugs.gnu.org; Tue, 21 Jun 2022 07:19:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3buU-0006HT-6V for guix-patches@gnu.org; Tue, 21 Jun 2022 07:19:06 -0400 Received: from mira.cbaines.net ([212.71.252.8]:36388) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3buS-0006BZ-7o for guix-patches@gnu.org; Tue, 21 Jun 2022 07:19:05 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 9FDB227BBE9 for ; Tue, 21 Jun 2022 12:19:01 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 8f20f767 for ; Tue, 21 Jun 2022 11:19:00 +0000 (UTC) From: Christopher Baines Date: Tue, 21 Jun 2022 12:19:00 +0100 Message-Id: <20220621111900.9229-1-mail@cbaines.net> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This avoids an exception when generating images, where the reading of boot parameters fails. * guix/scripts/system.scm (perform-action): Inline menu-entries in to bootcfg. --- guix/scripts/system.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 63e3b9b934..b9084a401c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -800,11 +800,6 @@ (define* (perform-action action image (define println (cut format #t "~a~%" <>)) - (define menu-entries - (if (eq? 'init action) - '() - (map boot-parameters->menu-entry (profile-boot-parameters)))) - (define os (image-operating-system image)) @@ -813,7 +808,11 @@ (define bootloader (define bootcfg (and (memq action '(init reconfigure)) - (operating-system-bootcfg os menu-entries))) + (operating-system-bootcfg + os + (if (eq? action 'init) + '() + (map boot-parameters->menu-entry (profile-boot-parameters)))))) (when (eq? action 'reconfigure) (maybe-suggest-running-guix-pull) -- 2.36.1 From unknown Tue Aug 19 02:59:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#56122] [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jun 2022 13:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56122 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines , 56122@debbugs.gnu.org Received: via spool by 56122-submit@debbugs.gnu.org id=B56122.16559033801039 (code B ref 56122); Wed, 22 Jun 2022 13:10:02 +0000 Received: (at 56122) by debbugs.gnu.org; 22 Jun 2022 13:09:40 +0000 Received: from localhost ([127.0.0.1]:34358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4071-0000Gh-QF for submit@debbugs.gnu.org; Wed, 22 Jun 2022 09:09:39 -0400 Received: from jpoiret.xyz ([206.189.101.64]:42502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o406z-0000GZ-Iq for 56122@debbugs.gnu.org; Wed, 22 Jun 2022 09:09:38 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 97F88185302; Wed, 22 Jun 2022 13:09:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1655903375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N/Jtg4ZIpYskTXbDwuZJUJ6DVvTMNotkTT0r/MlpU0A=; b=RN1nFd5cZSyhRLRpoNbcDBs18qo2E4TDJ+dDvj8ImP54btkY6/kINLrOtKjl+9SeLsBTHN 6xbd7xP1E8lTqwDF8Q0hdLMOY+p2qK6ZEbrpzw63tvqC3AnYDaRo26vVMyAqSfm2+N50S1 ty2nc5Zj23k0oZjeYp4bEd2S+Wrkr4RHRdxtDCJaM0vu2TQFxIuKABSi0+MBrhe/7dmtaZ V9ViybF1DPuXp4/108aPzbIVyIrGFsrBj+N5pl0h61XaDTg4FH4Ul2iPB23aPABTI5Na6B T5+OittQEVw4azNj8kSXAXHguUSrxxizfhPummrEGSuq8O242VOut0KU5Z+ocg== From: Josselin Poiret In-Reply-To: <20220621111900.9229-1-mail@cbaines.net> References: <20220621111900.9229-1-mail@cbaines.net> Date: Wed, 22 Jun 2022 15:09:35 +0200 Message-ID: <87bkuku9o0.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: text/plain Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Christopher, Christopher Baines writes: > This avoids an exception when generating images, where the reading of boot > parameters fails. > > * guix/scripts/system.scm (perform-action): Inline me [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Christopher, Christopher Baines writes: > This avoids an exception when generating images, where the reading of boot > parameters fails. > > * guix/scripts/system.scm (perform-action): Inline me [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hello Christopher, Christopher Baines writes: > This avoids an exception when generating images, where the reading of boot > parameters fails. > > * guix/scripts/system.scm (perform-action): Inline menu-entries in to bootcfg. Good catch! Seems good to me, except for the missing updated copyright notice at the top. Best, -- Josselin Poiret From unknown Tue Aug 19 02:59:12 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#56122: closed (Re: [bug#56122] [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action.) Message-ID: References: <87czezmvhe.fsf@cbaines.net> <20220621111900.9229-1-mail@cbaines.net> X-Gnu-PR-Message: they-closed 56122 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 56122@debbugs.gnu.org Date: Thu, 23 Jun 2022 12:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1655986262-2830-1" This is a multi-part message in MIME format... ------------=_1655986262-2830-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #56122: [PATCH] guix system: Inline menu-entries in to bootcfg in perform-a= ction. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 56122@debbugs.gnu.org. --=20 56122: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D56122 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1655986262-2830-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 56122-done) by debbugs.gnu.org; 23 Jun 2022 12:10:14 +0000 Received: from localhost ([127.0.0.1]:37651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4Lf4-0000i3-Jb for submit@debbugs.gnu.org; Thu, 23 Jun 2022 08:10:14 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4Ley-0000hk-Ql for 56122-done@debbugs.gnu.org; Thu, 23 Jun 2022 08:10:13 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id DF1F427BBE9; Thu, 23 Jun 2022 13:10:07 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 998a62b2; Thu, 23 Jun 2022 12:10:07 +0000 (UTC) References: <20220621111900.9229-1-mail@cbaines.net> <87bkuku9o0.fsf@jpoiret.xyz> User-agent: mu4e 1.6.10; emacs 28.1 From: Christopher Baines To: Josselin Poiret Subject: Re: [bug#56122] [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action. Date: Thu, 23 Jun 2022 13:09:27 +0100 In-reply-to: <87bkuku9o0.fsf@jpoiret.xyz> Message-ID: <87czezmvhe.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Josselin Poiret writes: > Hello Christopher, > > Christopher Baines writes: >> This avoids an exception when generating images, where the reading of boot >> parameters fails. >> >> * guix/scripts/system.sc [...] Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_HELO_TEMPERROR SPF: test of HELO record failed (temperror) -0.0 SPF_PASS SPF: sender matches SPF record 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 56122-done Cc: 56122-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.6 (/) --=-=-= Content-Type: text/plain Josselin Poiret writes: > Hello Christopher, > > Christopher Baines writes: >> This avoids an exception when generating images, where the reading of boot >> parameters fails. >> >> * guix/scripts/system.scm (perform-action): Inline menu-entries in to bootcfg. > > Good catch! Seems good to me, except for the missing updated copyright > notice at the top. Thanks for taking a look. I've pushed this as 8e2ff622ed7e493a644ebcff62299d2ed1c4e806. I forgot to update the copyright stuff, but I'll try and remember that for next time. Thanks again, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmK0WB1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xe+uQ//SeWLmvanheyuvi8VpCXyC2ryyjIeTpbM ufF/90ihl/Rk3aU49MVqaCQDk0gyCtSZZj/XGwioWiwsqkGUuutJvZNXYxlbrMS5 gNZ2sDbgh4ctIT1/x7WfPVVpTgo90PgWB33yy2T6RUNtWMtmXX34R3h4v3AoSu8R uetIq9M22i0k7m8wIqDam14CEKOMFeo9KrH1l3nYPcZtqiOk6J7BC5OhrzkyVsIX Yj5VN6j582t6BDTAIueNyniul5bdTU7d/4NR+Lb9hO2ASH1m/rNbxww3OAxTjXrw f4QJ5qhXYsiU5RHJdZg/8n8PuHCDt9zo3iUBL0BykkseZiWeXH7mPYjcW6Mt81en 2JAxYdT5d55B/03nZCqM8r31LcsYHJgguqadeZ10XS/zeQ5eeuJP3CMT2Q/Zrn+6 jmuaWQ1zcvybTPfoTYbXzkcQiK1X2vdv5bQnx4AW6m/whPH3gFlN0djO7aHy3548 OpdPwGrye+cTickFs1d4g0V9SNRHdNUJXaRNh08wpNQixPaXlj3BSElRY3BD0ATd vej83IV7rc6PFMUhuckRg5gwFtLQa8AInVuJFL0qjrXd6RPF3yeZG2dZjF1T4F7c mTtrZ/pze+SOA8AYGfcASN78EIc6YEhkQM1lXAm5XR3fXVYXO299SPxgZd7ojvC1 kkriLFexVf4= =gEwE -----END PGP SIGNATURE----- --=-=-=-- ------------=_1655986262-2830-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Jun 2022 11:19:08 +0000 Received: from localhost ([127.0.0.1]:59249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3buV-0005SN-SY for submit@debbugs.gnu.org; Tue, 21 Jun 2022 07:19:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:42470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3buU-0005SF-Il for submit@debbugs.gnu.org; Tue, 21 Jun 2022 07:19:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3buU-0006HT-6V for guix-patches@gnu.org; Tue, 21 Jun 2022 07:19:06 -0400 Received: from mira.cbaines.net ([212.71.252.8]:36388) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3buS-0006BZ-7o for guix-patches@gnu.org; Tue, 21 Jun 2022 07:19:05 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 9FDB227BBE9 for ; Tue, 21 Jun 2022 12:19:01 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 8f20f767 for ; Tue, 21 Jun 2022 11:19:00 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] guix system: Inline menu-entries in to bootcfg in perform-action. Date: Tue, 21 Jun 2022 12:19:00 +0100 Message-Id: <20220621111900.9229-1-mail@cbaines.net> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This avoids an exception when generating images, where the reading of boot parameters fails. * guix/scripts/system.scm (perform-action): Inline menu-entries in to bootcfg. --- guix/scripts/system.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 63e3b9b934..b9084a401c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -800,11 +800,6 @@ (define* (perform-action action image (define println (cut format #t "~a~%" <>)) - (define menu-entries - (if (eq? 'init action) - '() - (map boot-parameters->menu-entry (profile-boot-parameters)))) - (define os (image-operating-system image)) @@ -813,7 +808,11 @@ (define bootloader (define bootcfg (and (memq action '(init reconfigure)) - (operating-system-bootcfg os menu-entries))) + (operating-system-bootcfg + os + (if (eq? action 'init) + '() + (map boot-parameters->menu-entry (profile-boot-parameters)))))) (when (eq? action 'reconfigure) (maybe-suggest-running-guix-pull) -- 2.36.1 ------------=_1655986262-2830-1--