diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-16 12:07:46 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-12-16 22:19:34 +0000 |
| commit | 428f8f48de86fd59b67aa6d85ffbf7e961a6c469 (patch) | |
| tree | b58992ec10ac7c1989b5acedd45d8d6fc3e9b215 | |
| parent | Merge pull request #150484 from Ma27/kernels-21.05 (diff) | |
| download | nixpkgs-428f8f48de86fd59b67aa6d85ffbf7e961a6c469.tar.gz | |
Revert "nixos-rebuild: switch to tmpDir during rebuilds"
This seems to break
`boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages`
causing it to use `linuxPackages`.
(cherry picked from commit e6ca3fc97641974be0810fbbba1ca1cc7b4d5396)
| -rwxr-xr-x | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 95e77eafd2c3..37e0abaf4b42 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -359,16 +359,14 @@ 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 |