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 iLUxHbRN2WWKQwAAe85BDQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:20 +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 iLUxHbRN2WWKQwAAe85BDQ (envelope-from ) for ; Sat, 24 Feb 2024 03:00:20 +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=p7rTC1dN; 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=1708740020; 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=eOwWD3XbmUprSMA6YDJXBSyPxXOBgjQTTgd68vtUQp0=; b=AxFHk9IEyKJd4CLhmpBqzbJ6bAipYfeKIAZTpsTHQTTwQgedlX0wDWObCmAD7xic8cXBBO SSo7o5+LSJ9jBnG9qxrkEtyd08YagqOl11XxHDjITCkJF/qjQihuH2yNsuF6J6k9pXIr2j 4gNkjvPSCCg0MgEAXW/7DuTqQkYdH/Qy/r05C/uQfgLIbaHuY3YNJORAf9ywqzIKYJNEF6 JU+gLewd8F+O/lyAfKSWMpB6Oc+toFMxNU6b75DNBJk95rR3mP5ulIEWv+TaT9lTxAsU7j 2Z8X4dDGtomD7lpcrixrg326kKkcv8l2gytujKOuyDxn/cCqCiPU3bOVfsbO0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=p7rTC1dN; 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=1708740020; a=rsa-sha256; cv=none; b=AR4n5QQiWa4IoGkxUIrAfa3ud2gjiWYpMFvuzICqJWXBiaehkOx2Z9UruI7VqiA1loBr5a rhzAeOnE2UCKBfCfGpstP83g4dFOzFr7GlfClPh1wL4LcZqIxg0sImF0XsDxMesIbRrIR7 8xo+J7+v5kv3EmU71PhayQeqGb9C8RgvPUQClG7llHk9WOqAs91dPjG3nSzdyze0YowhO/ APFb+UCyg3oScWq5elzFU68tq96glfy4aYoByghQCl4vZXlJpd/sYH8Ywc7QHb0rB//P5Q u52jaUyo6uYfvgGfNjkAHQfJ4G8GNLdyORhsYhmpkH/XuTdyYWIMZ0h545lvyg== 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 0D4D73AB3A for ; Sat, 24 Feb 2024 03:00:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKR-0004U6-W0; Fri, 23 Feb 2024 20:59:52 -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 1rdhKK-0004Qe-9t for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:45 -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 1rdhKK-0006lM-29 for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKh-0003fD-RK for guix-patches@gnu.org; Fri, 23 Feb 2024 21:00:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 09/12] Give a separate name to a commonly used expression. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 02:00:07 +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 Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.170873995513822 (code B ref 69343); Sat, 24 Feb 2024 02:00:07 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:15 +0000 Received: from localhost ([127.0.0.1]:36551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJr-0003am-Fs for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:15 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:41020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJm-0003ZN-8V for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=3bmMbn8pjpS2E3l 7ZFHNeML7YSmQj/eAxisDQXbLLPc=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=p7rTC1dNsggapIUQQVJfb4eMXbEBD8vQyEDzHfdx wbH3fANerkNphu5+nRG0hKF6abyZMTw7t32LuNWA7yFZF+8S9AkOk0nj9VszepYPXcAJOz IJSZbpkDvobtEsz92O8v2uSQMH/TiISkykt3aJ7GeFCmWJPFPKhVq8VXXaEO0= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 9189a85f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:57 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 99433eed; Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:42 -0800 Message-ID: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.27 X-Spam-Score: -6.27 X-Migadu-Queue-Id: 0D4D73AB3A X-Migadu-Scanner: mx11.migadu.com X-TUID: l4+Md9ao3tOe Change-Id: I8d70684142bea736042d6c9dc8276ea7bdb9c181 --- gnu/machine/ssh.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 9adb5e79b9..45ab8b9868 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -584,14 +584,11 @@ (define (roll-back-managed-host machine) (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-alternatives)))) - (locale -> (boot-parameters-locale - (second boot-alternatives))) - (crypto-dev -> (boot-parameters-store-crypto-devices - (second boot-alternatives))) - (store-dir -> (boot-parameters-store-directory-prefix - (second boot-alternatives))) + (parameters (second boot-alternatives)) + (entries -> (list (boot-parameters->menu-entry parameters))) + (locale -> (boot-parameters-locale parameters)) + (crypto-dev -> (boot-parameters-store-crypto-devices parameters)) + (store-dir -> (boot-parameters-store-directory-prefix parameters)) (old-entries -> (map boot-parameters->menu-entry (drop boot-alternatives 2))) (bootloader -> (operating-system-bootloader -- 2.41.0