From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KFZlDaZB2WVGzwAAe85BDQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 02:08:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id KFZlDaZB2WVGzwAAe85BDQ (envelope-from ) for ; Sat, 24 Feb 2024 02:08:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=bwTZMkkJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708736934; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=iz+hQsXLkVxW7n8b+CdKvWo+LYgfml5Xws4ehdRwpS0=; b=Et8bJodceWhpf+0CCKuI1Tdiz9FJPe7omNKOPLozeltu3FWfRLZvMeXBkTOFhoo8/3c4JY t/GBeprO8yUFaaqqV50p+CxrTFxWCXdT+lf0/1EPgsfQHB0VitxMePKzlqNw/I+U/RKkZZ QGskKHACxw7r5tbTpL2RyH0E3xsU0jcZBzg8KiUDT8qdAjmhqN+9hw7npAr7RlQ4DVsMmV K3gqTgCVw9FkN9qCy/MlRbhhAPmDtgYBbHw7ZcOXJaz1/uqU7Slr9ZYMPFHKDCS6NIOzKl B7FLHsSttgY0cSIEyHNS/EzW4WTzYI579fLL+2VLhvfCc6l8GWpl96I9oLQ9qw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=bwTZMkkJ; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708736934; a=rsa-sha256; cv=none; b=UZqiCVd7HaVXpqz9muocnV3BZuVCRVkCZGnrgr8DhWhZbuEIsgywu9mJ5TBKhmvoVM9FTT u9iPxOirIOICN4dce2ePa/wxztJLGah529aikFsRYv/kWEXsa7V1RIg/tMH9N0oVhZDpR1 tQvCi6MV1StxeBK4sPB4NYAihxXml8lyjFPz5bGnGFuOkwPPtLv9bMjejcHW0VnimZtrMI c0DuYm9kci2QkOK08k/XMbVFvqaB0Qg/aL1ESMqh+hDXhCr5LktcJQ1Ek8ORmM0fFzdG1v Nyh15VveoV32pKDQBZjSZrvcKdr9PxySMNpJtEYYyIvzL24m5sw1hAFyrHNfzA== 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 CB4D41390C for ; Sat, 24 Feb 2024 02:08:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdgWz-0001yn-UA; Fri, 23 Feb 2024 20:08:45 -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 1rdgWx-0001y9-GC for guix-patches@gnu.org; Fri, 23 Feb 2024 20:08:43 -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 1rdgWv-0007IE-E0; Fri, 23 Feb 2024 20:08:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdgXG-0000yT-Hr; Fri, 23 Feb 2024 20:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 00/12] Simplify bootloader data structures and procedures Resent-From: Felix Lechner 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: Sat, 24 Feb 2024 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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 , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.17087368983605 (code B ref -1); Sat, 24 Feb 2024 01:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2024 01:08:18 +0000 Received: from localhost ([127.0.0.1]:60582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdgWX-0000w4-9q for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:08:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:44954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdgWU-0000vo-IM for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:08:15 -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 1rdgW6-00019L-7V for guix-patches@gnu.org; Fri, 23 Feb 2024 20:07:50 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rdgW3-00077u-67 for guix-patches@gnu.org; Fri, 23 Feb 2024 20:07:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=BSgVcUpqjfMU8RQ Ezi6CC5edwpWgCv06f5NF9C9pBa4=; h=date:subject:cc:to:from; d=lease-up.com; b=bwTZMkkJYo1QX9Ugpija1Ypx+Wls6ZFeMvyLMZOEmiHsyrTtBiIQ c5wfG2MhtCRoEZ7nJwEtkHc+LXSIbZZ+9JS/PA+m6B5OaOmzQ3pwNGg841C2yWz1jcP2W2 SHKwPkKksIfmaAoU7AxWwkOyzGOnGsRZVSg0ONR8RdaIWANJ0= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 187341b2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:07:44 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 579c22a2; Sat, 24 Feb 2024 01:07:44 +0000 (UTC) Date: Fri, 23 Feb 2024 17:05:59 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=208.82.101.137; envelope-from=felix.lechner@us-core.com; helo=sail-ipv4.us-core.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner 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-Spam-Score: -4.97 X-Spam-Score: -4.97 X-Migadu-Queue-Id: CB4D41390C X-Migadu-Scanner: mx13.migadu.com X-TUID: aaB2qxwskTOJ The bootloader data structures are hard to understand because the boot-parameter records are modified on the fly. It happened because those records are versioned when stored on disk, and changing the data structure was deemed to difficult. (I agree with that assessment.) This commit series uses a new record type to separate the on-disk and the in-memory concerns. As for the bug fix, I never actually saw the bug but believe from reading the code that a bug existed. The existence was not verified. 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 | 252 +--------------------------- gnu/system/boot.scm | 336 ++++++++++++++++++++++++++++++++++++++ guix/scripts/system.scm | 71 ++++---- tests/boot-parameters.scm | 1 + 5 files changed, 412 insertions(+), 322 deletions(-) create mode 100644 gnu/system/boot.scm base-commit: c0f88cd18649c31c75bcddf8247b14ef3e3a66a5 -- 2.41.0