Skip to content

Commit 4850438

Browse files
committed
nixos-remote.sh: don't create symlink in dir
1 parent 0e1de25 commit 4850438

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/nixos-remote.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,17 @@ timeout_ssh_() {
100100
ssh_() {
101101
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$ssh_connection" "$@"
102102
}
103-
nixCopy() {
104-
NIX_SSHOPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' nix copy --extra-experimental-features nix-command "$@"
103+
nix_copy() {
104+
NIX_SSHOPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' nix copy \
105+
--extra-experimental-features 'nix-command flakes' \
106+
"$@"
105107
}
106108
nix_build() {
107-
nix \
108-
--experimental-features flakes build \
109-
--extra-experimental-features nix-command \
109+
nix build \
110+
--extra-experimental-features 'nix-command flakes' \
110111
--no-write-lock-file \
111112
--print-out-paths \
113+
--no-link \
112114
"$@"
113115
}
114116

@@ -216,14 +218,14 @@ do
216218
ssh_ "umask 077; cat > $path" < "${disk_encryption_keys[$path]}"
217219
done
218220

219-
nixCopy --to "ssh://$ssh_connection" "$disko_script"
221+
nix_copy --to "ssh://$ssh_connection" "$disko_script"
220222
ssh_ "$disko_script"
221223

222224
if [[ ${stop_after_disko-n} == "y" ]]; then
223225
exit 0
224226
fi
225227

226-
nixCopy --to "ssh://$ssh_connection?remote-store=local?root=/mnt" "$nixos_system"
228+
nix_copy --to "ssh://$ssh_connection?remote-store=local?root=/mnt" "$nixos_system"
227229
if [[ -n ${extra_files:-} ]]; then
228230
if [[ -d "$extra_files" ]]; then
229231
extra_files="$extra_files/"

0 commit comments

Comments
 (0)