From f23d47cef845901a6a6f09d58fec3e12c3111c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Apr 2024 12:23:50 +0200 Subject: [PATCH 1/2] image-installer: make json a bit shorter --- nix/image-installer/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/image-installer/module.nix b/nix/image-installer/module.nix index fb5a7b8..c4f9951 100644 --- a/nix/image-installer/module.nix +++ b/nix/image-installer/module.nix @@ -73,7 +73,7 @@ in --arg password "$(cat /var/shared/root-password)" \ --arg onion_address "$(cat /var/shared/onion-hostname)" \ --argjson local_addrs "$local_addrs" \ - '{ password: $password, tor: $onion_address, addresses: $local_addrs }' \ + '{ pass: $password, tor: $onion_address, addrs: $local_addrs }' \ > /var/shared/login.json cat /var/shared/login.json | qrencode -s 2 -m 2 -t utf8 -o /var/shared/qrcode.utf8 ''; From 8c987b74b39d689fb6ff7bafb8e510fb9ca297fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Apr 2024 12:24:41 +0200 Subject: [PATCH 2/2] fix build --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index 23ea25d..60f4b76 100755 --- a/build-images.sh +++ b/build-images.sh @@ -29,7 +29,7 @@ build_kexec_installer() { build_image_installer() { declare -r tag=$1 arch=$2 tmp=$3 - out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.image-installer-${tag//./}${variant}") + out=$(nix build --print-out-paths --option accept-flake-config true -L ".#packages.${arch}.image-installer-${tag//./}") echo "$out/iso/nixos-installer-${arch}.iso" }