From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mCSoMVrL6mUqUwAA62LTzQ:P1 (envelope-from ) for ; Fri, 08 Mar 2024 09:24:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id mCSoMVrL6mUqUwAA62LTzQ (envelope-from ) for ; Fri, 08 Mar 2024 09:24:58 +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=kpSNmRgJ; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=QAkQORfa; 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=1709886298; 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=59PnQh1Z0BGr4NiEOvq3I4w5uEyj1RNru59DieJCnFI=; b=BAtJEUdwb7mYH7pW/3SN2HLSrh1SmpndIex4f0tiy7n016vOpqE9/0EtpFT1S7IBXCy70P G+tCyPK/Vl7GT2syW5+dywtc5o/Apb9z322kZUoT6Gsc0TELx4C8BosX3Ohzcn8L5aLDPc V6Pv4Z8GJVqwQ+x9HcmWcgdbXY593DDIw9N3u7lPjgoFeF6m+/hEx4IF4ubxvVtICt9j0h /GeP8LP2EiY1a/kic6aE51EoPaUQgpwIerN/GEanaIOAuigr+ShnKgaFgWbdkOR0Zjuc90 WGHvL918z/q05QkjxpiZKMO7JNsw+A5B1I4ZJr00xlj7aOb0Wy9ayMSWIAtB4g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=kpSNmRgJ; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=QAkQORfa; 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=1709886298; a=rsa-sha256; cv=none; b=qsdRR6j9G4W+pft2E+27q9B1E0Dq8nh7GKnmFDaWyybZbEhCMlK2/zJP7MpqjS5P12CQ3A EcMH0AAF5xu9L4y82g6g6qZRMsrVaYdyPFF4VrNsmPiw8VTPNjkRLRKLZmPKhNyoRBrcf2 c2r85L43SVD9EG5U/9UQ0lzfN/E+rT+YkLm3LQgc2XGs7NTYK9/s3MkDXqy+/+07msUHBa PjulBfhsui3KLfBgklKvqfdpKMJOySZ3/JsOvTr1aHggUrU0E9rkbw1+B6hZimK8j5pFxC m1zZ0nH+LPjHTgnbGY/ghF6W8x4mtqhRz71nYdJ92ql8KtI5kk/rIhijU++GXw== 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 981E31C52D for ; Fri, 8 Mar 2024 09:24:58 +0100 (CET) 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 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 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.28 X-Spam-Score: -5.28 X-Migadu-Queue-Id: 981E31C52D X-TUID: GMPDGpmE6YW5 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 seri= es: * (gnu system boot) was missing a few imports that it needs to work. * (gnu system boot) requires the procedure system-linux-image-file-name, wh= ich is defined in (gnu system). I moved it over to (gnu system boot). * generation->boot-alternative in (guix scripts system) had typos in variab= les 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 extra= neous information and just got in the way when trying to look at the actual pat= ch 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 --=20 2.41.0