Merge #26

26: nixos-remote.sh: don't create symlink in dir & add --print-build-logs/-L flag r=Mic92 a=Kranzes



Co-authored-by: Ilan Joselevich <personal@ilanjoselevich.com>

Author: bors[bot]

src/nixos-remote.sh

@@ -6,6 +6,8 @@ Options:
 
 * -f, --flake flake
   set the flake to install the system from
+* -L, --print-build-logs
+  print full build logs
 * -s, --store-paths
   set the store paths to the disko-script and nixos-system directly
   if this is give, flake is not needed
@@ -44,6 +46,9 @@ while [[ $# -gt 0 ]]; do
       flake=$2
       shift
       ;;
+    -L | --print-build-logs)
+      print_build_logs=y
+      ;;
     -s | --store-paths)
       disko_script=$(readlink -f "$2")
       nixos_system=$(readlink -f "$3")
@@ -63,6 +68,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     --debug)
       enable_debug="-x"
+      print_build_logs=y
       set -x
       ;;
     --extra-files)
@@ -100,15 +106,26 @@ timeout_ssh_() {
 ssh_() {
   ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$ssh_connection" "$@"
 }
-nixCopy() {
-  NIX_SSHOPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' nix copy --extra-experimental-features nix-command "$@"
+
+nix_options=(
+  --extra-experimental-features 'nix-command flakes'
+  "--no-write-lock-file"
+)
+
+if [[ ${print_build_logs-n} == "y" ]]; then
+  nix_options+=("-L")
+fi
+
+nix_copy() {
+  NIX_SSHOPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' nix copy \
+    "${nix_options[@]}" \
+    "$@"
 }
 nix_build() {
-  nix \
-    --experimental-features flakes build \
-    --extra-experimental-features nix-command \
-    --no-write-lock-file \
+  nix build \
+    "${nix_options[@]}" \
     --print-out-paths \
+    --no-link \
     "$@"
 }
 
@@ -216,14 +233,14 @@ do
   ssh_ "umask 077; cat > $path" < "${disk_encryption_keys[$path]}"
 done
 
-nixCopy --to "ssh://$ssh_connection" "$disko_script"
+nix_copy --to "ssh://$ssh_connection" "$disko_script"
 ssh_ "$disko_script"
 
 if [[ ${stop_after_disko-n} == "y" ]]; then
   exit 0
 fi
 
-nixCopy --to "ssh://$ssh_connection?remote-store=local?root=/mnt" "$nixos_system"
+nix_copy --to "ssh://$ssh_connection?remote-store=local?root=/mnt" "$nixos_system"
 if [[ -n ${extra_files:-} ]]; then
   if [[ -d "$extra_files" ]]; then
     extra_files="$extra_files/"