yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cli: only use sudo when deploying locally

Browse Source
This commit is contained in:
Michael Hoang
2025-04-22 17:08:21 +10:00
parent a0117c51c1
commit b5901d5577
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/clan-cli/clan_cli/machines/update.py
View File

@@ -156,21 +156,24 @@ def deploy_machines(machines: list[Machine]) -> None:
switch_cmd = ["nixos-rebuild", "switch", *nix_options] switch_cmd = ["nixos-rebuild", "switch", *nix_options]
test_cmd = ["nixos-rebuild", "test", *nix_options] test_cmd = ["nixos-rebuild", "test", *nix_options]
become_root = True
target_host: Host | None = host.meta.get("target_host") target_host: Host | None = host.meta.get("target_host")
if target_host: if target_host:
become_root = False
switch_cmd.extend(["--target-host", target_host.target]) switch_cmd.extend(["--target-host", target_host.target])
test_cmd.extend(["--target-host", target_host.target]) test_cmd.extend(["--target-host", target_host.target])
if (target_host and target_host.user != "root") or host.user != "root": if target_host.user != "root":
switch_cmd.extend(["--use-remote-sudo"]) switch_cmd.extend(["--use-remote-sudo"])
test_cmd.extend(["--use-remote-sudo"]) test_cmd.extend(["--use-remote-sudo"])
env = host.nix_ssh_env(None) env = host.nix_ssh_env(None)
ret = host.run( ret = host.run(
switch_cmd, switch_cmd,
RunOpts(check=False, msg_color=MsgColor(stderr=AnsiColor.DEFAULT)), RunOpts(check=False, msg_color=MsgColor(stderr=AnsiColor.DEFAULT)),
extra_env=env, extra_env=env,
become_root=True, become_root=become_root,
) )
# Last output line (config store path) is printed to stdout instead of stderr # Last output line (config store path) is printed to stdout instead of stderr
@@ -193,7 +196,7 @@ def deploy_machines(machines: list[Machine]) -> None:
test_cmd if is_mobile else switch_cmd, test_cmd if is_mobile else switch_cmd,
RunOpts(msg_color=MsgColor(stderr=AnsiColor.DEFAULT)), RunOpts(msg_color=MsgColor(stderr=AnsiColor.DEFAULT)),
extra_env=env, extra_env=env,
become_root=True, become_root=become_root,
) )
with AsyncRuntime() as runtime: with AsyncRuntime() as runtime: