From patchwork Tue Feb 13 10:50:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 60263 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 56D5227BBEA; Tue, 13 Feb 2024 10:54:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7076427BBE2 for ; Tue, 13 Feb 2024 10:54:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZqQ7-0000Nu-Da; Tue, 13 Feb 2024 05:53: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 1rZqQ5-0000NU-85 for guix-patches@gnu.org; Tue, 13 Feb 2024 05:53: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 1rZqQ4-0004wL-WF for guix-patches@gnu.org; Tue, 13 Feb 2024 05:53:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZqQM-00069d-3G for guix-patches@gnu.org; Tue, 13 Feb 2024 05:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69092] [PATCH v2] machine/ssh: Refresh parameterization of %CURRENT-SYSTEM. References: <9915f5dc0cea842a9c4c3f3a13f2c97e6ee60432.1707778239.git.rekado@elephly.net> In-Reply-To: <9915f5dc0cea842a9c4c3f3a13f2c97e6ee60432.1707778239.git.rekado@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Feb 2024 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69092 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69092@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 69092-submit@debbugs.gnu.org id=B69092.170782159723584 (code B ref 69092); Tue, 13 Feb 2024 10:54:02 +0000 Received: (at 69092) by debbugs.gnu.org; 13 Feb 2024 10:53:17 +0000 Received: from localhost ([127.0.0.1]:41970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZqPc-00068K-PF for submit@debbugs.gnu.org; Tue, 13 Feb 2024 05:53:17 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]:21045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZqPW-000688-Pq for 69092@debbugs.gnu.org; Tue, 13 Feb 2024 05:53:15 -0500 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1707821569; cv=none; d=zohomail.com; s=zohoarc; b=RieRvagjORhCytLT/32e9mmUd146L2gqNwrQus/4lZ0IbDGbnzQq8OEz2MkKnKeDKIhmKermj9UZsm95yBvv5cthLy73WPG0z2+sKZQ1zdhsqJOk1LGSaaIGuWfilAg848vrN01S2KyGw7MUtBLbaLRli9OAfXDgleE1exIkg60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707821569; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=Xd2QkRHMUhKT+9RKyOfPCFCvT1HnsXf743fCxSYTTpY=; b=D19avym0+NtXDSm4EX9xRXXvCLT14EPO2dpfoJF21ehkU1eokJLQWQp7EexQWoyXFYePb8FTJflgNTHJxwvYts8EBad6nUOYuesrJ8/aEKdLC6qSKmNdm1elNPosKLkrYbSxroKUaKA7rhuMBdcN+vuFWysvh0+SF1LZXl10W8g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707821569; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=Xd2QkRHMUhKT+9RKyOfPCFCvT1HnsXf743fCxSYTTpY=; b=RovHN/YrsmTaRPCsZzv2Yfrxz1JIr0CLH2rke1lawo/5Cgr3d/Nfae/B+HwjQZRw t4AYhk6OIdPw1PChz5fz3ktrmCnrc1gnKBNAP40KOUJXVc9Ez2VyWKAG4LYRnVBBz11 w9RrhHMXiZ24BHD54wuW9gNZKyZbS5WMuKiBefQA= Received: from localhost (i5E862CC9.versanet.de [94.134.44.201]) by mx.zohomail.com with SMTPS id 170782156815962.43711905787882; Tue, 13 Feb 2024 02:52:48 -0800 (PST) From: Ricardo Wurmus Date: Tue, 13 Feb 2024 11:50:02 +0100 Message-ID: <20240213105213.9508-2-rekado@elephly.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-ZohoMailClient: External 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: , 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 The inversion actually didn't help. For some reason, the effect of PARAMETERIZE is lost. With the patch below I can deploy to the i686-linux laptop from my x86_64-linux machine again. From 0a37481608e4ec02c96ef9b54a417bade55528da Mon Sep 17 00:00:00 2001 Message-ID: <0a37481608e4ec02c96ef9b54a417bade55528da.1707821400.git.rekado@elephly.net> From: Ricardo Wurmus Date: Mon, 12 Feb 2024 23:45:54 +0100 Subject: [PATCH v2] machine/ssh: Refresh parameterization of %CURRENT-SYSTEM. When using "guix deploy" on an x86_64-linux machine to deploy a system to i686-linux, DEPLOY-MANAGED-HOST would revert %CURRENT-SYSTEM to the host system's value by the time it evaluated UPGRADE-SHEPHERD-SERVICES. The earlier PARAMETERIZE would no longer be effective. * gnu/machine/ssh.scm (deploy-managed-host): Ensure that UPGRADE-SHEPHERD-SERVICES is evaluated for the architecture of the target machine. Change-Id: I0816da79cd7c46a69418717fa33b2fe4e2fabae0 --- gnu/machine/ssh.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) base-commit: bb4f0509b7cce750fc944e604aa919ea89910ea7 prerequisite-patch-id: 94eb24b4353a5dec691918e2258cab6f0873fd98 prerequisite-patch-id: d9e728fe0e2597792f468fea405c04845b31bc75 prerequisite-patch-id: a4c47cb27daff30f775243af50a8ae9d8af0300e prerequisite-patch-id: 7258bad0bbb2065c66be06c685d6dd237d8d0670 prerequisite-patch-id: 2bc8562f64bd31a92045dabeb0e9749eadb1b562 prerequisite-patch-id: fadcf73ca0278af9f58f5bd2ddb6b1ad1b223dc3 prerequisite-patch-id: d1f94c163297151b41e6febed26f5833cd1b2ea8 prerequisite-patch-id: 9a9328cc3a35f5a8903f43e164749a62d48d697e prerequisite-patch-id: f1e33c0ea08b372c33edbcacc750c74897e0b5ab diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index b5984dc732..b47ce7c225 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2020-2023 Ludovic Courtès +;;; Copyright © 2024 Ricardo ;;; ;;; This file is part of GNU Guix. ;;; @@ -537,22 +538,24 @@ (define (deploy-managed-host machine) host (inferior-exception-arguments c)))) os)) - (with-roll-back #t - (mbegin %store-monad - (upgrade-shepherd-services (eval/error-handling c - (warning (G_ "\ + (parameterize ((%current-system system) + (%current-target-system #f)) + (with-roll-back #t + (mbegin %store-monad + (upgrade-shepherd-services (eval/error-handling c + (warning (G_ "\ an error occurred while upgrading services on '~a':~%~{~s ~}~%") - host - (inferior-exception-arguments - c))) - os) - (install-bootloader (eval/error-handling c - (raise (formatted-message - (G_ "\ + host + (inferior-exception-arguments + c))) + os) + (install-bootloader (eval/error-handling c + (raise (formatted-message + (G_ "\ failed to install bootloader on '~a':~%~{~s ~}~%") - host - (inferior-exception-arguments c)))) - bootloader-configuration bootcfg)))))))) + host + (inferior-exception-arguments c)))) + bootloader-configuration bootcfg))))))))) ;;;