Skip to content

Commit

Permalink
nixos-rebuild: switch to tmpDir during rebuilds
Browse files Browse the repository at this point in the history
This is a workaround for issue #144811 until this issue is either fixed
on nix itself.
  • Loading branch information
thiagokokada committed Dec 10, 2021
1 parent d0d209f commit f88bd76
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f88bd76

Please sign in to comment.