Skip to content

Commit 17cc299

Browse files
bors[bot]Lassulus
andauthored
Merge #87
87: build-on-remote: fix check for store_paths r=Mic92 a=Lassulus Co-authored-by: lassulus <git@lassul.us>
2 parents 28be739 + af10a53 commit 17cc299

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/nixos-anywhere.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ done
302302

303303
pubkey=$(ssh-keyscan -t ed25519 "${ssh_connection//*@/}" 2>/dev/null | sed -e 's/^[^ ]* //' | base64 -w0)
304304

305-
if [[ -n ${disko_script-} ]] && [[ ${build_on_remote-n} == "y" ]]; then
305+
if [[ -z ${disko_script-} ]] && [[ ${build_on_remote-n} == "y" ]]; then
306306
disko_script=$(
307307
nix_build "${flake}#nixosConfigurations.\"${flakeAttr}\".config.system.build.disko" \
308308
--builders "ssh://$ssh_connection?base64-ssh-public-host-key=$pubkey&ssh-key=$ssh_key_dir/nixos-anywhere $is_arch-linux"
@@ -318,7 +318,7 @@ if [[ ${stop_after_disko-n} == "y" ]]; then
318318
exit 0
319319
fi
320320

321-
if [[ -n ${nixos_system-} ]] && [[ ${build_on_remote-n} == "y" ]]; then
321+
if [[ -z ${nixos_system-} ]] && [[ ${build_on_remote-n} == "y" ]]; then
322322
nixos_system=$(
323323
nix_build "${flake}#nixosConfigurations.\"${flakeAttr}\".config.system.build.toplevel" \
324324
--builders "ssh://$ssh_connection?remote-store=local?root=/mnt&base64-ssh-public-host-key=$pubkey&ssh-key=$ssh_key_dir/nixos-anywhere $is_arch-linux"

0 commit comments

Comments
 (0)