From patchwork Fri May 9 06:02:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 42474 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 3A5F027BC4A; Fri, 9 May 2025 07:04:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1FF5F27BC49 for ; Fri, 9 May 2025 07:04:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDGqA-0004d8-NI; Fri, 09 May 2025 02:04:10 -0400 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 1uDGq2-0004bf-Uk for guix-patches@gnu.org; Fri, 09 May 2025 02:04:02 -0400 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 1uDGq2-00039j-Me for guix-patches@gnu.org; Fri, 09 May 2025 02:04:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QwBsfceGtQS9myS7WtGN7PYeKY26Uli8gSPQiFIcf3k=; b=bUJXtT8nlKOrHpmHgALt3Mh4wTS7gZKOQA0GFmQqKMXSfEz0pwRld2nYtbueNFIu04FNGa+kyKO6WHa+GrkOgd91W/mhiwJ3pPUlxexgJ97k2X/TAKcxYpo+BGy4XDOGVn/j9Af6XifNFPVq/X8r+JVMaBV3G9vtyhtUDsDzdkCcFO+ut6s9eMcUsmDL9fSYMKEhSM3hZL5IQlvLwQU4DSuZXz1Vu948kOkIJfyU8grluEASroSgFPw4U/Baz4+9+ynEvlxS5sI2ZYryHoEKXLHj8hOrQU3Gv4IBO2q5TSLkV/XDmiFgVMzQtocry4LuyQ9tF/IZ5E2M1vLOjO4zkQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDGq2-0002ZV-G8 for guix-patches@gnu.org; Fri, 09 May 2025 02:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75010] [PATCH v4 1/5] gnu: machine: ssh: Refactor roll-back-managed-host. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 06:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 75010@debbugs.gnu.org Received: via spool by 75010-submit@debbugs.gnu.org id=B75010.17467706189804 (code B ref 75010); Fri, 09 May 2025 06:04:02 +0000 Received: (at 75010) by debbugs.gnu.org; 9 May 2025 06:03:38 +0000 Received: from localhost ([127.0.0.1]:34609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDGpd-0002Y2-OC for submit@debbugs.gnu.org; Fri, 09 May 2025 02:03:38 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:50871 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDGpZ-0002XI-OK for 75010@debbugs.gnu.org; Fri, 09 May 2025 02:03:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1746770603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KovGb9q5Hzxl+fhWRoiB5wNgqVKByyi3gnd/e5c5+Zo=; b=A/IqKLEBEKbz3Kv1NnUPutl0i/Ja2Rnyr1A4mPVyJuVPTEu8bEbwR5+4EIzbhb7T7+5OOr JpjrBRGohYKp+YH7C4BkiNFY6RgF7Oe7C5bnx0XO3gfnCkB3Wr1a/nKS0tQZTBQpqYMH+8 GSEMzFIp6k8IZCQz/viT//1GFnR2j+27HEwUyytpg9CkUQYQPkpKg1WVDXlpjnhtyOkqfq 4f+6E2WEXEmRha4u4b/axd9R0fHmDI7ig34Zdv5CEcYv3GZ3+LVL9bHL1YUo8vQfcwdLuV LiWmLYJJSqVrxyIMqUyVxUbK9Buc4xbHXmzm5e4hGNp3nPw4gRumOSGSrR1NFA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b4f98ec1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75010@debbugs.gnu.org>; Fri, 9 May 2025 06:03:23 +0000 (UTC) Date: Fri, 9 May 2025 08:02:25 +0200 Message-ID: <1b5bd68abb306b6102202f2ef8c194c7c26a1507.1746769714.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/machine/ssh.scm (roll-back-managed-host): Use let* and mbegin. Change-Id: Ic3d5039ecf01e1e965dce8a696e7dbd625d2b3c5 --- gnu/machine/ssh.scm | 57 +++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 73d5dc513ee..696b349a303 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -3,6 +3,8 @@ ;;; Copyright © 2020-2024 Ludovic Courtès ;;; Copyright © 2024 Ricardo ;;; Copyright © 2025 Arun Isaac +;;; Copyright © 2024 Felix Lechner +;;; Copyright © 2025 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -597,34 +599,33 @@ (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) - (raise roll-back-failure))) - (entries -> (map boot-parameters->menu-entry - (list (second boot-parameters)))) - (locale -> (boot-parameters-locale - (second boot-parameters))) - (crypto-dev -> (boot-parameters-store-crypto-devices - (second boot-parameters))) - (store-dir -> (boot-parameters-store-directory-prefix - (second boot-parameters))) - (old-entries -> (map boot-parameters->menu-entry - (drop boot-parameters 2))) - (bootloader -> (operating-system-bootloader - (machine-operating-system machine))) - (bootcfg (lower-object - ((bootloader-configuration-file-generator - (bootloader-configuration-bootloader - bootloader)) - bootloader entries - #:locale locale - #:store-crypto-devices crypto-dev - #:store-directory-prefix store-dir - #:old-entries old-entries))) - (remote-result (machine-remote-eval machine remote-exp))) - (if (eqv? 'error remote-result) - (raise roll-back-failure) - (return remote-result)))) + (mlet %store-monad + ((boot-parameters (machine-boot-parameters machine))) + (match boot-parameters + ((_ params rest ...) + (let* ((entries (list (boot-parameters->menu-entry params))) + (locale (boot-parameters-locale params)) + (crypto-dev (boot-parameters-store-crypto-devices params)) + (store-dir (boot-parameters-store-directory-prefix params)) + (old-entries (map boot-parameters->menu-entry rest)) + (bootloader (operating-system-bootloader + (machine-operating-system machine))) + (generate-bootloader-configuration-file + (bootloader-configuration-file-generator + (bootloader-configuration-bootloader bootloader)))) + (mbegin %store-monad + (lower-object (generate-bootloader-configuration-file + bootloader entries + #:locale locale + #:store-crypto-devices crypto-dev + #:store-directory-prefix store-dir + #:old-entries old-entries))) + (mlet %store-monad + ((remote-result (machine-remote-eval machine remote-exp))) + (if (eqv? 'error remote-result) + (raise roll-back-failure) + (return remote-result))))) + (_ (raise roll-back-failure))))) ;;;