about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nixos-rebuild
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2021-12-10 10:50:46 -0300
committerThiago Kenji Okada <thiagokokada@gmail.com>2021-12-10 10:50:46 -0300
commitf88bd76fcd132e3f525a84bea976cac08a545afd (patch)
treeced5903c7c13284aea1f4b7ad54f0c6967a27a33 /pkgs/os-specific/linux/nixos-rebuild
parentd0d209fd591c40ac8a2be4a0379ee14ab5b556bb (diff)
downloadnixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar.gz
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar.bz2
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar.lz
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar.xz
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.tar.zst
nixlib-f88bd76fcd132e3f525a84bea976cac08a545afd.zip
nixos-rebuild: switch to tmpDir during rebuilds
This is a workaround for issue #144811 until this issue is either fixed
on nix itself.
Diffstat (limited to 'pkgs/os-specific/linux/nixos-rebuild')
-rwxr-xr-xpkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index e5e40dca086e..7f6d6ce22827 100755
--- 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