Merge pull request #150975 from NixOS/revert-150065-workaround-issue-144811
Revert "nixos-rebuild: switch to tmpDir during rebuilds"
commitfb0091f0947e206845b226f03f99f7a1d9dbb407
authorMaximilian Bosch <maximilian@mbosch.me>
dateThu 16 Dec 2021, 23:15 (5 years ago)
parent7acf783e6ca3fc
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh+1−3
@@ -362,16 +362,14 @@ if [ "$action" = edit ]; then
362362 exit 1
363363fi
364364
365−ORIGIN_PWD="$PWD"
365+
366366tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
367367SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
368−cd "$tmpDir"
369368
370369cleanup() {
371370 for ctrl in "$tmpDir"/ssh-*; do
372371 ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
373372 done
374− cd "$ORIGIN_PWD"
375373 rm -rf "$tmpDir"
376374}
377375trap cleanup EXIT