diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-07 11:57:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-07 11:58:10 +0200 |
| commit | 707703185dfede1af71d37ac474f1112d280b771 (patch) | |
| tree | b17ec53ba25e4dcc610230f231ab31cb17883f44 /nixos/modules/installer/tools/nixos-rebuild.sh | |
| parent | 6e4a343fa4922ecc67b94350250bd375e8d67a0e (diff) | |
| download | nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar.gz nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar.bz2 nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar.lz nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar.xz nixpkgs-707703185dfede1af71d37ac474f1112d280b771.tar.zst nixpkgs-707703185dfede1af71d37ac474f1112d280b771.zip | |
nixos-rebuild: Respect empty NIX_REMOTE
Fixes #11384. Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid ambiguity.
Diffstat (limited to 'nixos/modules/installer/tools/nixos-rebuild.sh')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4b5e7b3230c..9ede74a54cd 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -250,7 +250,7 @@ trap cleanup EXIT # If --repair is given, don't try to use the Nix daemon, because the # flag can only be used directly. if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then - export NIX_REMOTE=${NIX_REMOTE:-daemon} + export NIX_REMOTE=${NIX_REMOTE-daemon} fi |