Merge pull request 'cli: fix machines update failing with protocol mismatch on macOS' (#4008) from push-rmpkuustzxxu into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4008
This commit is contained in:
@@ -56,7 +56,7 @@ def upload_sources(machine: Machine, ssh: Remote) -> str:
|
||||
)
|
||||
|
||||
# Construct the remote URL with proper parameters for Darwin
|
||||
remote_url = f"ssh://{ssh.target}"
|
||||
remote_url = f"ssh-ng://{ssh.target}"
|
||||
# MacOS doesn't come with a proper login shell for ssh and therefore doesn't have nix in $PATH as it doesn't source /etc/profile
|
||||
if machine._class_ == "darwin":
|
||||
remote_url += "?remote-program=bash -lc 'exec nix-daemon --stdio'"
|
||||
|
||||
Reference in New Issue
Block a user