From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 6ICOEsPL6mU/AgEAe85BDQ:P1 (envelope-from ) for ; Fri, 08 Mar 2024 09:26:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6ICOEsPL6mU/AgEAe85BDQ (envelope-from ) for ; Fri, 08 Mar 2024 09:26:43 +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=TSrlKwYM; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KzSwqPXg; 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=1709886403; 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=A22wVx1YHxdPxXLtA0liAVwD2/rPii3bypi1GL1dxX4=; b=pJvZ/CF5ufsaNEo89+CSRnHIhVCM5CkPU6lr7u/7IaJnklNsBb6AwL5JfM6m7L4D7vqm+N PV+OBECsW+vt7SIXYBnnLfuzn6aEVNIBMHdWBgtHHXWg9izySP2g+yG76DpQ4zGCFgWKZ6 rFhf9LMoAPK6lVVIpRRJgYSa1uwX7eS9Lb4gEUUB/pLl6va/3L3iBISUhcVTFZdLos5hC+ Je0YFA2cPeR7eSL2KK728Fer58MY+ZuUVRo4vuv4U403uTgxZ7Uh+ju2zbDQ13GbR61OE8 SsNj5M+RSSDJjzVGBCH9IT2D9hrs04QTrzgcW4kakjNPo6cLuAOdBJ8nFpfBCA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709886403; a=rsa-sha256; cv=none; b=Ms42NRKYP7ZunHLlZ1AVGPeFPn0IaeEBYA52oQdMoWVQUwI9izAjR7t+6Ix9/DqO+V2c2N E+bL4zgSKMxzEmKT8L/ovb3WdXWWJVmNNMyHgIFPooLR1wXXZhU2F9rjFr/QxXknSg5K05 kLdC5zB7uDdEZOZB5Ymo/lKv9Mz2cAdm2VjZ5xmss09fsrCEQizjjPuXt3oOGye9QnXRqD UCaRFKLuwkFhb6K/QeFWXJh9MjPUh7dll/P1QHJwBu4d9BCfdSCa0Tg+2fMstGehn7dGvx h5XfWJe2Y+W8SvCWbcIGK9o6rtDhrisl4JgZx7kmZGq+MH1kjdkQWKZb6Gkpng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=TSrlKwYM; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=KzSwqPXg; 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 0B41D42C54 for ; Fri, 8 Mar 2024 09:26:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riVY3-00042P-9f; Fri, 08 Mar 2024 03:25:47 -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 1riVXv-0003vs-T9 for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:41 -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 1riVXu-00018t-E0; Fri, 08 Mar 2024 03:25:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riVYM-0002fB-Vy; Fri, 08 Mar 2024 03:26:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v2 12/12] Encapsulate to retain generation, system-path and epoch. 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:06 +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.170988635710086 (code B ref 69343); Fri, 08 Mar 2024 08:26:06 +0000 Received: (at 69343) by debbugs.gnu.org; 8 Mar 2024 08:25:57 +0000 Received: from localhost ([127.0.0.1]:56424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVYC-0002cW-IX for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:57 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:50398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVY5-0002bJ-UQ for 69343@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:51 -0500 DKIM-Signature: a=rsa-sha256; b=TSrlKwYMvaiAH4jB5Mes/kd5usj3qi4eBxQG+gLqGTBfp32raYaIsvzsJq3lomiKU8Avhh4h8HjW+vo2ukj2YRDOSCmQmB4mA1phIkA8El/9SMsbELpEKdocPR9SstzvU9plAR5K0KnmgPCeym/vh/Tu+7Dgjq2nQQeEvN4/OfLeQzTIHP4qDwQqmVQdFk76zAxO9TWVXEBJzNXDJaXhVIKAIZQSnynY90eAm8mvin9uBq9XO4I3nEJtYDj+lqK1dpUpUCe69isQ3E/Uu61mlxNhbVMYDSKC9x1SEn2KvndadHtfbdpy9kFoYvpWoW4/AsEfiH1jDzWSylJ5FA+7iA==; s=purelymail2; d=lunabee.space; v=1; bh=NMujglk2l9ZujaqjgcerdFyC1t4oJvu/cL9oS6fEb3E=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=KzSwqPXgJf3LiCNG6XMlI1Ech4CmUw/Fcx1RNPg1WdA62bnAhqkd/Jn3VipTLySaCioGNyuETAEy90hSdVIxVFjuOCRyr+RjPPqDiZTVXiXe6nlgLIan3D2o/CBxN0yTetk5lsva5qrQfmsYuEH3rEPxl4fCtSmKJ+/jRmPzybbuwyLRDusJJ6P+3wTSeraokOMEJUEyncnVuddWAz5suEejcxjxPqJDgxPZ7oO8YgA+cNKfQ4p0PTy6IxVx5Unf7YMqCmkjphkUyTFdYdQ+0CEsie66RJb/ibDJLiNTPcUSWh8tMpyv34xiDkSOtG1Lvy+DJ+GUroJymRarO+ASsA==; s=purelymail2; d=purelymail.com; v=1; bh=NMujglk2l9ZujaqjgcerdFyC1t4oJvu/cL9oS6fEb3E=; 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:23 +0000 (UTC) Date: Fri, 8 Mar 2024 02:12:08 -0600 Message-ID: <1242fe7e331528023c6d2a4768256d8f48607b34.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: 0B41D42C54 X-Migadu-Scanner: mx11.migadu.com X-TUID: jTyXJf2WwEF0 From: Felix Lechner * gnu/system/boot.scm (): New record. * gnu/machine/ssh.scm (machine->boot-alternatives): Return a boot-alternative encapsulating previous return value. (with-roll-back, roll-back-managed-host): Get parameters from boot-alternatives. * guix/scripts/system.scm (generation->boot-parameters): Rename to... (generation->boot-alternative): ...this. Return a boot-alternative encapsulating previous return value. (profile->boot-alternatives): Rename uses as above. (reinstall-bootloader, perform-action): Get parameters from boot-alternatives. Change-Id: Iaef0b0a3fa9240ca8315a9699bcf4a7bfe908e33 --- gnu/machine/ssh.scm | 32 ++++++++++++++++++++------------ gnu/system/boot.scm | 14 ++++++++++++++ guix/scripts/system.scm | 32 +++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 45ab8b9868..61125dddce 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -415,8 +415,8 @@ (define not-config? (_ #f))) =20 (define (machine->boot-alternatives machine) - "Monadic procedure returning a list of 'boot-parameters' for the generat= ions -of MACHINE's system profile, ordered from most recent to oldest." + "Monadic procedure returning a list of records for th= e +generations of MACHINE's system profile, ordered from most recent to oldes= t." (define bootable-kernel-arguments (@@ (gnu system) bootable-kernel-arguments)) =20 @@ -460,13 +460,18 @@ (define (machine->boot-alternatives machine) read-boot-parameters)) (root (boot-parameters-root-device params)) (text (boot-parameters-label params)) - (version (boot-parameters-version params))) - (boot-parameters - (inherit params) - (label (decorated-boot-label text generation epoch)) - (kernel-arguments - (append (bootable-kernel-arguments system-path root ver= sion) - (boot-parameters-kernel-arguments params)))))))= ) + (version (boot-parameters-version params)) + (parameters (boot-parameters + (inherit params) + (label (decorated-boot-label text gener= ation epoch)) + (kernel-arguments + (append (bootable-kernel-arguments sys= tem-path root version) + (boot-parameters-kernel-argume= nts params)))))) + (boot-alternative + (generation generation) + (system-path system-path) + (epoch epoch) + (parameters parameters)))))) remote-results)))) =20 (define-syntax-rule (with-roll-back should-roll-back? mbody ...) @@ -510,7 +515,8 @@ (define (deploy-managed-host machine) (%current-target-system #f)) (let* ((os (machine-operating-system machine)) (eval (cut machine-remote-eval machine <>)) - (menu-entries (map boot-parameters->menu-entry boot-alternati= ves)) + (menu-entries (map boot-parameters->menu-entry + (map boot-alternative-parameters boot-alte= rnatives))) (bootloader-configuration (operating-system-bootloader os)) (bootcfg (operating-system-bootcfg os menu-entries))) (define-syntax-rule (eval/error-handling condition handler ...) @@ -584,13 +590,15 @@ (define (roll-back-managed-host machine) (mlet* %store-monad ((boot-alternatives (machine->boot-alternatives mach= ine)) (_ -> (if (< (length boot-alternatives) 2) (raise roll-back-failure))) - (parameters (second boot-alternatives)) + (chosen-alternative (second boot-alternatives)) + (parameters (boot-alternative-parameters chosen-alt= ernative)) (entries -> (list (boot-parameters->menu-entry para= meters))) (locale -> (boot-parameters-locale parameters)) (crypto-dev -> (boot-parameters-store-crypto-device= s parameters)) (store-dir -> (boot-parameters-store-directory-pref= ix parameters)) (old-entries -> (map boot-parameters->menu-entry - (drop boot-alternatives 2))) + (map boot-alternative-paramete= rs + (drop boot-alternatives 2= )))) (bootloader -> (operating-system-bootloader (machine-operating-system machine))= ) (bootcfg (lower-object diff --git a/gnu/system/boot.scm b/gnu/system/boot.scm index b39e7d8610..edb4d213b9 100644 --- a/gnu/system/boot.scm +++ b/gnu/system/boot.scm @@ -70,6 +70,13 @@ (define-module (gnu system boot) read-boot-parameters read-boot-parameters-file =20 + boot-alternative + boot-alternative? + boot-alternative-generation + boot-alternative-system-path + boot-alternative-epoch + boot-alternative-parameters + epoch->date-string decorated-boot-label boot-parameters->menu-entry @@ -277,6 +284,13 @@ (define (read-boot-parameters-file system) (kernel-arguments (append (bootable-kernel-arguments system root vers= ion) (boot-parameters-kernel-arguments params)))= ))) =20 +(define-record-type* + boot-alternative make-boot-alternative boot-alternative? + (generation boot-alternative-generation) + (system-path boot-alternative-system-path) + (epoch boot-alternative-epoch) + (parameters boot-alternative-parameters)) + (define (epoch->date-string epoch) "Return a string representing the date for EPOCH seconds." (let ((time (make-time time-utc 0 epoch))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 7f6ba20ef9..97804ad736 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -323,26 +323,31 @@ (define-syntax-rule (unless-file-not-found exp) #f (apply throw args))))) =20 -(define (generation->boot-parameters profile number) - "Return the 'boot-parameters' for the generation of PROFILE specified +(define (generation->boot-alternative profile number) + "Return the 'boot-alternative' for the generation of PROFILE specified by NUMBER." (unless-file-not-found (let* ((system (generation-file-name profile number)) (params (read-boot-parameters-file system)) (epoch (stat:mtime (lstat system))) - (text (boot-parameters-label params))) - (boot-parameters - (inherit params) - (label (decorated-boot-label text number epoch)))))) + (text (boot-parameters-label params)) + (parameters (boot-parameters + (inherit params) + (label (decorated-boot-label text number epoch))))) + (boot-alternative + (generation number) + (system-path system) + (epoch epoch) + (parameters parameters))))) =20 (define* (profile->boot-alternatives #:optional (profile %system-profile) (numbers (reverse (generation-numbers profile= )))) - "Return a list of 'boot-parameters' for the generations of PROFILE speci= fied + "Return a list of 'boot-alternative' for the generations of PROFILE spec= ified by NUMBERS, which is a list of generation numbers. The list is ordered fro= m the most recent to the oldest profiles." (filter-map (lambda (number) - (generation->boot-parameters profile number)) + (generation->boot-alternative profile number)) numbers)) =20 =0C @@ -391,7 +396,9 @@ (define (reinstall-bootloader store number) (bootloader bootloader))) =20 ;; Make the specified system generation the default entry. - (params (generation->boot-parameters %system-profile number)) + (chosen-alternative (generation->boot-alternative + %system-profile number)) + (params (boot-alternative-parameters chosen-alternative)) (locale (boot-parameters-locale params)) (store-crypto-devices (boot-parameters-store-crypto-devices param= s)) (store-directory-prefix @@ -402,7 +409,8 @@ (define (reinstall-bootloader store number) %system-profile old-generations)) (entries (list (boot-parameters->menu-entry params))) (old-entries (map boot-parameters->menu-entry - previous-boot-alternatives))) + (map boot-alternative-parameters + previous-boot-alternatives)))) (run-with-store store (mlet* %store-monad ((bootcfg (lower-object @@ -818,7 +826,9 @@ (define* (perform-action action image os (if (eq? action 'init) '() - (map boot-parameters->menu-entry (profile->boot-alternatives= )))))) + (map boot-parameters->menu-entry + (map boot-alternative-parameters + (profile->boot-alternatives))))))) =20 (when (eq? action 'reconfigure) (maybe-suggest-running-guix-pull) --=20 2.41.0