From 3c02453705da390b814e3ac74c11b6ee712db7c3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Apr 2024 21:04:41 +0200 Subject: [PATCH] installer: fix qr code again --- nixosModules/installer/default.nix | 2 +- pkgs/clan-cli/clan_cli/ssh/cli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixosModules/installer/default.nix b/nixosModules/installer/default.nix index a93ffd02..acb2784a 100644 --- a/nixosModules/installer/default.nix +++ b/nixosModules/installer/default.nix @@ -47,7 +47,7 @@ --arg password "$(cat /var/shared/root-password)" \ --arg onion_address "$(cat /var/shared/onion-hostname)" \ --argjson local_addrs "$local_addrs" \ - '{ pass: $password, onion_address: $onion_address, local_addrs: $local_addrs }' \ + '{ pass: $password, onion_address: $onion_address, addrs: $local_addrs }' \ > /var/shared/login.json cat /var/shared/login.json | qrencode -t utf8 -o /var/shared/qrcode.utf8 ''; diff --git a/pkgs/clan-cli/clan_cli/ssh/cli.py b/pkgs/clan-cli/clan_cli/ssh/cli.py index 1f7489d1..d793d806 100644 --- a/pkgs/clan-cli/clan_cli/ssh/cli.py +++ b/pkgs/clan-cli/clan_cli/ssh/cli.py @@ -85,7 +85,7 @@ def is_reachable(host: str) -> bool: def connect_ssh_from_json(ssh_data: dict[str, str]) -> None: - for address in ssh_data["local_addrs"]: + for address in ssh_data["addrs"]: log.debug(f"Trying to reach host on: {address}") if is_reachable(address): ssh(host=address, password=ssh_data["pass"])