From patchwork Fri Mar 8 08:11:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 1763 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0281B27BBEA; Fri, 8 Mar 2024 08:24:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 83DC027BBE2 for ; Fri, 8 Mar 2024 08:24:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riVWt-0003CN-Nj; Fri, 08 Mar 2024 03:24:35 -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 1riVWs-0003Ar-Ag for guix-patches@gnu.org; Fri, 08 Mar 2024 03:24:34 -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 1riVWr-0000nw-SJ; Fri, 08 Mar 2024 03:24:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riVXK-0002XH-Dw; Fri, 08 Mar 2024 03:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v2 00/12] Simplify bootloader data structures and procedures References: In-Reply-To: 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: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: Lilah Tascheter , 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.17098862739665 (code B ref 69343); Fri, 08 Mar 2024 08:25:02 +0000 Received: (at 69343) by debbugs.gnu.org; 8 Mar 2024 08:24:33 +0000 Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVWq-0002Vp-Sw for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:24:33 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:50210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVWn-0002VR-VP for 69343@debbugs.gnu.org; Fri, 08 Mar 2024 03:24:31 -0500 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=kpSNmRgJ0MFOo8DkdMxkoo0PZ3wii9E06WMlCJSzAbrDI6FFQJu89niWMuG+7kWwcjsBOuuYpdPeMGjWsbh/HnYNZ98lsmeUTILgHCIihDdP2lacw687m5xYOrFsTZt3pRLvyr0WwqUpMZGcukSq1eu/9KDKjquR77j3Ya7U9TcGr/ESJnEDRLi3lcV7Ekr8kjA81fj8U0Th2TyyW0dOtw0lxKc5lbVBG4TXaeE6gUa/BJXeXU9yPV66ZQcu9ZcuKy847XbeTQLMf9laPu1JHB0U3OJD/giqDFqt6NpKSFD6Prqv1QhmHKaj7BUZdyyECfknl2zsHwppQL5z0LgOwQ==; s=purelymail2; d=lunabee.space; v=1; bh=rq1YGOQ69j2PKA3HR1cP3JLqkTVj/gY4p7B5/FbTPqE=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=QAkQORfachqouDD5vRQq31dPShbFApA9V4TooTGIwaUlSlg7nMYJv2aLv47aOq3PlrA2Ske/ZnSDxyAmQ7KqfJt41grl5s0MF8cZkXMiKodxZUo+fHk4kPsSiL/r1gdGaqhLxVNYg2nEqMx1wNhorsZT03IWtxme6T7MJDypm6H94XLlw+/Mc2cKcwo11pIQUXL3FsgUaP/TNk6fBqsFTQ1qgeZ1YmEAkiJnIpJFiL/j4bTkNuXvMLkDGVyISpcxBuRA6meD2w8WhMu/y7eYQAQ6mZObfq7r+6olCXF9NMiVEX/t9e8swKAMmzBlFMuXmwU+CpmbtO8+n3ehs/ReoQ==; s=purelymail2; d=purelymail.com; v=1; bh=rq1YGOQ69j2PKA3HR1cP3JLqkTVj/gY4p7B5/FbTPqE=; 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:23:39 +0000 (UTC) Date: Fri, 8 Mar 2024 02:11:56 -0600 Message-ID: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail 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: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter 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 hey! this is really useful!! love having access to generation numbers alongside boot params, and the terminology fixing's great too :) noticed a few problems - took the liberty to fix them in this v2 patch series: * (gnu system boot) was missing a few imports that it needs to work. * (gnu system boot) requires the procedure system-linux-image-file-name, which is defined in (gnu system). I moved it over to (gnu system boot). * generation->boot-alternative in (guix scripts system) had typos in variables resulting in them not being used. * commit messages didn't have relevant gnu changelog info. * one of those commit messages had a wholeass log that's Way too much extraneous information and just got in the way when trying to look at the actual patch this v2 passes all relevant unit tests, but could still definately use some verification that the modified paths function properly before I'd say this is ready to be merged. notably, system reconfigure and ssh managed machine reconfigure should be verified, but then it should be good? thanks ya!! - lilah Felix Lechner (12): Fix bug where the extra menu entries for a bootloader were shown twice. Move record to a separate file. Also move boot-parameters->menu-entry. Rename seconds->string procedure to epoch->date-string. Move epoch->date-string to gnu/system/boot.scm and use it elsewhere. Offer a uniform decorated-boot-label and use it. Rename boot-parameters to boot-alternatives when appropriate. Rename two remote variables confusingly named 'generations'. Give a separate name to a commonly used expression. Simplify profile->boot-alternatives. Split generation->boot-parameters out of profile->boot-alternatives. Encapsulate to retain generation, system-path and epoch. gnu/machine/ssh.scm | 74 ++++---- gnu/system.scm | 264 +--------------------------- gnu/system/boot.scm | 354 ++++++++++++++++++++++++++++++++++++++ guix/scripts/system.scm | 71 ++++---- tests/boot-parameters.scm | 1 + 5 files changed, 430 insertions(+), 334 deletions(-) create mode 100644 gnu/system/boot.scm base-commit: 9038a46751c5090246e64b63ff752064833c435b