diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-16 12:07:46 -0300 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-16 14:47:07 -0300 |
| commit | e6ca3fc97641974be0810fbbba1ca1cc7b4d5396 (patch) | |
| tree | b43cef3830ec30b2944982d8f1a4fd42bc93ef61 /pkgs/os-specific/linux/nixos-rebuild | |
| parent | 1a3873c93d9c2136fd58986cc73469a2deef0789 (diff) | |
| download | nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar.gz nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar.bz2 nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar.lz nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar.xz nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.tar.zst nixpkgs-e6ca3fc97641974be0810fbbba1ca1cc7b4d5396.zip | |
Revert "nixos-rebuild: switch to tmpDir during rebuilds"
This seems to break `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages` causing it to use `linuxPackages`.
Diffstat (limited to 'pkgs/os-specific/linux/nixos-rebuild')
| -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 7f6d6ce2282..e5e40dca086 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -362,16 +362,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 |