Merge pull request 'fix build_host not beeing applied' (#3740) from fix-build-host into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3740
This commit is contained in:
@@ -143,7 +143,6 @@ def deploy_machine(machine: Machine) -> None:
|
|||||||
become_root = True
|
become_root = True
|
||||||
|
|
||||||
if machine._class_ == "nixos":
|
if machine._class_ == "nixos":
|
||||||
switch_cmd = ["nixos-rebuild", "switch", *nix_options]
|
|
||||||
nix_options += [
|
nix_options += [
|
||||||
"--fast",
|
"--fast",
|
||||||
"--build-host",
|
"--build-host",
|
||||||
@@ -156,6 +155,7 @@ def deploy_machine(machine: Machine) -> None:
|
|||||||
|
|
||||||
if target_host.user != "root":
|
if target_host.user != "root":
|
||||||
nix_options += ["--use-remote-sudo"]
|
nix_options += ["--use-remote-sudo"]
|
||||||
|
switch_cmd = ["nixos-rebuild", "switch", *nix_options]
|
||||||
elif machine._class_ == "darwin":
|
elif machine._class_ == "darwin":
|
||||||
# use absolute path to darwin-rebuild
|
# use absolute path to darwin-rebuild
|
||||||
switch_cmd = [
|
switch_cmd = [
|
||||||
|
|||||||
Reference in New Issue
Block a user