From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sKh1E7hN2WUX1gAA62LTzQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id sKh1E7hN2WUX1gAA62LTzQ (envelope-from ) for ; Sat, 24 Feb 2024 03:00:24 +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=kQUqC2He; 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=1708740024; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=opiO9lwU0ff4b2/MX3q8E5ZuNy0xD7BbnOnr/G0akNA=; b=XE8appxfvtMDhOR2Ie2N2bmJiA/xlQ6HLY0EeHfkdOfyfTVnMM/YHr+/cHl8VrCweQ2WP1 fXtqx+uvlyYFPYhxkaDCne8IJpaK9xLhQwXqsghmN5JGJntbNPykD6k5X0hnr50KrY6F29 N1HRVNuhTrCTLyqAd7QYjIfPDyTIor6OtQP4y+I4dYrdLURTQzorUPgAiGaLvVxrUihU4T QV+XlO19OTnhZelBf1ETWTW+TiFi7v/fjL5TOERFd3NUexC8uCPPw7gxCVFDzDNfHPl8B1 ox6LYN7yU/b4qVfqkVEDskCUtCif/qYawyi3H237syw+9cv4gK6Kl1pkNzmHcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=kQUqC2He; 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=1708740024; a=rsa-sha256; cv=none; b=b0SD91d/VoPs5699/HzuCDsa9e+HRUYGdSXqM86srMTN1CwSA0eYHFv7C+XQthyaOOXKkQ j+wILPGLIGJXhg9afhT4kqBLUaMl3YIR97G6P/cbx/AVZw9H9hRDsMFFI9sDHaGonvt9uH FuE18KRhhwmUjDcc0LWoejBCtlPD1cg/b+mc0WAHWsd7Jxa+F0HG5fRmthpQG4WWC6lpsq zdV+8FQsk3lkXw0vGTUCQMqw/7iPDcOuVYagmd9W+9XQbUmc4tJ+FIEpkWUOtsY0AVFHbp gjlsh3Hh/0ZGkhIldWmvsnFJMXymMLak0QcFgB79y6EqfMKWFUVimvB6L2m2Pw== 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 D83DBCEB9 for ; Sat, 24 Feb 2024 03:00:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKV-0004VO-FI; Fri, 23 Feb 2024 20:59:55 -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 1rdhKN-0004SQ-Ia for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:48 -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 1rdhKM-0006mm-SD; Fri, 23 Feb 2024 20:59:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKj-0003g4-I7; Fri, 23 Feb 2024 21:00:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 07/12] Rename boot-parameters to boot-alternatives when appropriate. 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 02:00:09 +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 =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 69343-submit@debbugs.gnu.org id=B69343.170873997913902 (code B ref 69343); Sat, 24 Feb 2024 02:00:09 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:39 +0000 Received: from localhost ([127.0.0.1]:36586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhKE-0003c3-TL for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:39 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:37576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJl-0003YB-GF for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=fuBUMmGfDL3W87l vpvV4Rrmx/rNjZomQkl40E0+7qw8=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=kQUqC2HecLS/jMfevHVOcayMCIoWmBnZGfP+bQod 9jZCVZ48gQKRQkXJEw+Hkxx45XLV7GqMD2U17JTMRWhODfnDW+yIinoP98ljSjIYxaE+AW 20sVn1cdYZ/YVsfTceEBwJhrBlRNBZ8a2sMhFonsAI9ZxTR/bD1MFMnqJVYCk= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id b48d1f84 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 532d2ed5; Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:40 -0800 Message-ID: <4e6ac07abb8ade8d10ce5a7c41836abebfb4ed4a.1708736440.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -2.91 X-Spam-Score: -2.91 X-Migadu-Queue-Id: D83DBCEB9 X-TUID: E3EiNsSPC1xt Throughout the code base, the token 'boot-parameters' refers to collection of data that is stored on disk for each system generation. It was confusing to use it for a list of such records. This comment imposes an alternative name. Change-Id: Iabb04dbb39f42f989692bede7304f20a69bef9fb --- gnu/machine/ssh.scm | 20 ++++++++++---------- guix/scripts/system.scm | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index fe47474470..11534c6740 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -414,7 +414,7 @@ (define not-config? (('gnu _ ...) #t) (_ #f))) -(define (machine-boot-parameters machine) +(define (machine->boot-alternatives machine) "Monadic procedure returning a list of 'boot-parameters' for the generations of MACHINE's system profile, ordered from most recent to oldest." (define bootable-kernel-arguments @@ -503,14 +503,14 @@ (define (deploy-managed-host machine) (machine-become-command machine))) (mlet %store-monad ((_ (check-deployment-sanity machine)) - (boot-parameters (machine-boot-parameters machine))) + (boot-alternatives (machine->boot-alternatives machine))) ;; Make sure code that check %CURRENT-SYSTEM, such as ;; %BASE-INITRD-MODULES, gets to see the right value. (parameterize ((%current-system system) (%current-target-system #f)) (let* ((os (machine-operating-system machine)) (eval (cut machine-remote-eval machine <>)) - (menu-entries (map boot-parameters->menu-entry boot-parameters)) + (menu-entries (map boot-parameters->menu-entry boot-alternatives)) (bootloader-configuration (operating-system-bootloader os)) (bootcfg (operating-system-bootcfg os menu-entries))) (define-syntax-rule (eval/error-handling condition handler ...) @@ -581,19 +581,19 @@ (define (roll-back-managed-host machine) (define roll-back-failure (condition (&message (message (G_ "could not roll-back machine"))))) - (mlet* %store-monad ((boot-parameters (machine-boot-parameters machine)) - (_ -> (if (< (length boot-parameters) 2) + (mlet* %store-monad ((boot-alternatives (machine->boot-alternatives machine)) + (_ -> (if (< (length boot-alternatives) 2) (raise roll-back-failure))) (entries -> (map boot-parameters->menu-entry - (list (second boot-parameters)))) + (list (second boot-alternatives)))) (locale -> (boot-parameters-locale - (second boot-parameters))) + (second boot-alternatives))) (crypto-dev -> (boot-parameters-store-crypto-devices - (second boot-parameters))) + (second boot-alternatives))) (store-dir -> (boot-parameters-store-directory-prefix - (second boot-parameters))) + (second boot-alternatives))) (old-entries -> (map boot-parameters->menu-entry - (drop boot-parameters 2))) + (drop boot-alternatives 2))) (bootloader -> (operating-system-bootloader (machine-operating-system machine))) (bootcfg (lower-object diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 09d29dbbb1..fd9f0727ee 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -323,9 +323,9 @@ (define-syntax-rule (unless-file-not-found exp) #f (apply throw args))))) -(define* (profile-boot-parameters #:optional (profile %system-profile) - (numbers - (reverse (generation-numbers profile)))) +(define* (profile->boot-alternatives #:optional (profile %system-profile) + (numbers + (reverse (generation-numbers profile)))) "Return a list of 'boot-parameters' for the generations of PROFILE specified by NUMBERS, which is a list of generation numbers. The list is ordered from the most recent to the oldest profiles." @@ -390,18 +390,19 @@ (define (reinstall-bootloader store number) (bootloader bootloader))) ;; Make the specified system generation the default entry. - (params (first (profile-boot-parameters %system-profile - (list number)))) + (params (first (profile->boot-alternatives %system-profile + (list number)))) (locale (boot-parameters-locale params)) (store-crypto-devices (boot-parameters-store-crypto-devices params)) (store-directory-prefix (boot-parameters-store-directory-prefix params)) (old-generations (delv number (reverse (generation-numbers %system-profile)))) - (old-params (profile-boot-parameters - %system-profile old-generations)) + (previous-boot-alternatives (profile->boot-alternatives + %system-profile old-generations)) (entries (list (boot-parameters->menu-entry params))) - (old-entries (map boot-parameters->menu-entry old-params))) + (old-entries (map boot-parameters->menu-entry + previous-boot-alternatives))) (run-with-store store (mlet* %store-monad ((bootcfg (lower-object @@ -817,7 +818,7 @@ (define* (perform-action action image os (if (eq? action 'init) '() - (map boot-parameters->menu-entry (profile-boot-parameters)))))) + (map boot-parameters->menu-entry (profile->boot-alternatives)))))) (when (eq? action 'reconfigure) (maybe-suggest-running-guix-pull) -- 2.41.0