diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-15 12:26:21 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 12:26:21 -0300 |
| commit | eb23f6713ddd9090c7c4ad7230b81bf4da278e6e (patch) | |
| tree | 2f1caf28b9917eba36146623efda5c499643d362 | |
| parent | Merge pull request #150773 from NixOS/backport-150742-to-release-21.11 (diff) | |
| parent | nixos-rebuild: switch to tmpDir during rebuilds (diff) | |
| download | nixpkgs-eb23f6713ddd9090c7c4ad7230b81bf4da278e6e.tar.gz | |
Merge pull request #150857 from NixOS/backport-150065-to-release-21.11
[Backport release-21.11] nixos-rebuild: switch to tmpDir during rebuilds
| -rwxr-xr-x | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 |
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 244e1c1d52b1..5874487a3d2d 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 |