me
/
guix
Archived
1
0
Fork 0
Code

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
master
Ricardo Wurmus 2024-02-12 23:45:54 +01:00
parent 052ef14521
commit 9ce548a26e
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/machine/ssh.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Ricardo <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -537,22 +538,24 @@ failed to switch systems while deploying '~a':~%~{~s ~}")
host host
(inferior-exception-arguments c)))) (inferior-exception-arguments c))))
os)) os))
(with-roll-back #t (parameterize ((%current-system system)
(mbegin %store-monad (%current-target-system #f))
(upgrade-shepherd-services (eval/error-handling c (with-roll-back #t
(warning (G_ "\ (mbegin %store-monad
(upgrade-shepherd-services (eval/error-handling c
(warning (G_ "\
an error occurred while upgrading services on '~a':~%~{~s ~}~%") an error occurred while upgrading services on '~a':~%~{~s ~}~%")
host host
(inferior-exception-arguments (inferior-exception-arguments
c))) c)))
os) os)
(install-bootloader (eval/error-handling c (install-bootloader (eval/error-handling c
(raise (formatted-message (raise (formatted-message
(G_ "\ (G_ "\
failed to install bootloader on '~a':~%~{~s ~}~%") failed to install bootloader on '~a':~%~{~s ~}~%")
host host
(inferior-exception-arguments c)))) (inferior-exception-arguments c))))
bootloader-configuration bootcfg)))))))) bootloader-configuration bootcfg)))))))))
;;; ;;;