From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 12 21:51:16 2024 Received: (at submit) by debbugs.gnu.org; 13 Feb 2024 02:51:16 +0000 Received: from localhost ([127.0.0.1]:38579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZit9-0004vr-OS for submit@debbugs.gnu.org; Mon, 12 Feb 2024 21:51:16 -0500 Received: from lists.gnu.org ([209.51.188.17]:39802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZiX3-0003rl-GG for submit@debbugs.gnu.org; Mon, 12 Feb 2024 21:28:26 -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 1rZf8n-0007t3-TX for guix-patches@gnu.org; Mon, 12 Feb 2024 17:51:09 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZf8k-00067L-Rx for guix-patches@gnu.org; Mon, 12 Feb 2024 17:51:09 -0500 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1707778261; cv=none; d=zohomail.com; s=zohoarc; b=HUArrk2E5TcbokHKD1sB7Q/DxGZNu9REUwDgqf9Ye8GWcdEj+//c+BRfZ13X944qkBRsRJzayYiDisPgwSKmsQ5TEWxxhDV8Fffp9z1JzDeynWScaHpzsVg51xb+3uKzf4krilLPlo/mN+lQbE8mRejHsmPETz5litLG50Mdb8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707778261; 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=2uhAX0bavuypogu8bvE39LreOMo4woMpmRES6+kOtNs=; b=gzE7anS4H94c74uKdJXdlRrjqCKQ1/vSda5kbMA1MmxsDkQ6/OK0xuxhRKybRqFCEpXhUQbX4yrRUjAOMCLRgRVBYc+FJyayqMmNYGW+9Ej+A0uXyE7FfWqMH0NVF1RroYhDtgfCQwVj/mfqgc/QKxBgO4iFSdW7rySOBLKquQY= 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=1707778261; 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=2uhAX0bavuypogu8bvE39LreOMo4woMpmRES6+kOtNs=; b=W+zFoLUUbihOrqUVfvfW34scmbtO567nObZZf/euUzmdJylm1wR+yQi0vbS6/nhP x7Bfsv0C52KpISpnoScsOIcgDjwsYmbhBUOYONTck1kTNjLKI7boVXvXScZFI5BUr80 OnK7EgrG2lW8lRtvcyGYOWPGt0BOkWSGBSWsZtyU= Received: from localhost (36-109-142-46.pool.kielnet.net [46.142.109.36]) by mx.zohomail.com with SMTPS id 1707778260463428.42568756250273; Mon, 12 Feb 2024 14:51:00 -0800 (PST) From: Ricardo Wurmus To: guix-patches@gnu.org Subject: [PATCH] machine/ssh: Invert WITH-ROLL-BACK and MBEGIN. Date: Mon, 12 Feb 2024 23:50:39 +0100 Message-ID: <9915f5dc0cea842a9c4c3f3a13f2c97e6ee60432.1707778239.git.rekado@elephly.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.50; envelope-from=rekado@elephly.net; helo=sender4-of-o50.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Ricardo Wurmus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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. Turning the expression inside out solves the problem as the monadic expression introduced with MBEGIN retains the %CURRENT-SYSTEM parameter. * 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index b5984dc732..011d197917 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,8 +538,8 @@ (define (deploy-managed-host machine) host (inferior-exception-arguments c)))) os)) - (with-roll-back #t - (mbegin %store-monad + (mbegin %store-monad + (with-roll-back #t (upgrade-shepherd-services (eval/error-handling c (warning (G_ "\ an error occurred while upgrading services on '~a':~%~{~s ~}~%") base-commit: bb4f0509b7cce750fc944e604aa919ea89910ea7 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 05:53:17 2024 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 To: 69092@debbugs.gnu.org Subject: [PATCH v2] machine/ssh: Refresh parameterization of %CURRENT-SYSTEM. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69092 Cc: Ricardo Wurmus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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))))))))) ;;; 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 20 08:50:13 2024 Received: (at 69092-done) by debbugs.gnu.org; 20 Feb 2024 13:50:13 +0000 Received: from localhost ([127.0.0.1]:44589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQVg-0001S8-Ob for submit@debbugs.gnu.org; Tue, 20 Feb 2024 08:50:13 -0500 Received: from sender3-of-o58.zoho.com ([136.143.184.58]:21839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcQVe-0001Rz-BM for 69092-done@debbugs.gnu.org; Tue, 20 Feb 2024 08:50:11 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1708436986; cv=none; d=zohomail.com; s=zohoarc; b=Ac16BKXaUyGMAX/Etoqlcdaxusferj1O9OA6BoRjSCBRno1NM17oriSaUnI8/gynG2oR4jN4TidofOQAl/elVgc7uENgiWmzgHPWNmqyW+qogmFzPbKpE38Zqohkr5f7E3/k+sqR0X50O1wtdQKKp7Q0lKYoDN4nDG3K4SQcsnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708436986; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=HOdxOQWarZcwUDCvhnVgBvwa1PpxU/q6ZJTR0tJpBrI=; b=kTJtDnQHBSTDOZnvjmkmOkleknXmGUgWKTgTspcaeidF1zDKgkDDxS2TWedO/1xOgInhkbAQzjwiaRgZMyapeKm1CnHS5d7cayRBZYsxUA3+VSkUDf8WUbYsRq/SOSPrLPnl6kDnDG65wRqJIKydjtnrEOz+6PP/1LpPIqzqxAc= 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=1708436986; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=HOdxOQWarZcwUDCvhnVgBvwa1PpxU/q6ZJTR0tJpBrI=; b=idUbG6tdWz9B0Pw//kLd73VwZPFo4sl7Nw43wETWODtrtk9pCyCBBD9H8ZwgcjCT vEhS2vY7AHHHN+dxCbxSlUbMIx0CsQMcnNbFGlpPTK/eDgpk6eFATiY9b5YQ3BAtriQ s/lfJjmLtrtoDLrG+PaotmqkImHhlb+E0V7EsQkY= Received: from localhost (171-109-142-46.pool.kielnet.net [46.142.109.171]) by mx.zohomail.com with SMTPS id 1708436984146857.4265117666297; Tue, 20 Feb 2024 05:49:44 -0800 (PST) User-agent: mu4e 1.10.8; emacs 29.1 From: Ricardo Wurmus To: 69092-done@debbugs.gnu.org Subject: [PATCH] machine/ssh: Invert WITH-ROLL-BACK and MBEGIN. Date: Tue, 20 Feb 2024 14:48:55 +0100 Message-ID: <87zfvvckjv.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69092-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) I=E2=80=99ve pushed the v2 of this patch to work around this problem for no= w, but it is not a satisfying conclusion. --=20 Ricardo From unknown Sat Jun 21 05:19:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 20 Mar 2024 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator