Merge pull request #150065 from thiagokokada/workaround-issue-144811

nixos-rebuild: switch to tmpDir during rebuilds
NixOS · Dec 15, 2021 · d95c811 · d95c811
2 parents 1f7ea35 + f88bd76
commit d95c811
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -362,14 +362,16 @@ if [ "$action" = edit ]; then
     exit 1
 fi
 
-
+ORIGIN_PWD="$PWD"
 tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
 SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
+cd "$tmpDir"
 
 cleanup() {
     for ctrl in "$tmpDir"/ssh-*; do
         ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
     done
+    cd "$ORIGIN_PWD"
     rm -rf "$tmpDir"
 }
 trap cleanup EXIT