public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21272 from mguentner/sshopts_fix

Browse Source 
nixos-rebuild: Fix SSHOPTS typo
This commit is contained in:
Rickard Nilsson 2016-12-19 08:18:43 +01:00 committed by GitHub
commit 4b3f1063aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -126,9 +126,9 @@ targetHostCmd() {
copyToTarget() { copyToTarget() {
if ! [ "$targetHost" = "$buildHost" ]; then if ! [ "$targetHost" = "$buildHost" ]; then
if [ -z "$targetHost" ]; then if [ -z "$targetHost" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1" NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1"
elif [ -z "$buildHost" ]; then elif [ -z "$buildHost" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1" NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1"
else else
buildHostCmd nix-copy-closure --to "$targetHost" "$1" buildHostCmd nix-copy-closure --to "$targetHost" "$1"
fi fi
@ -169,7 +169,7 @@ nixBuild() {
local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
if [ -a "$drv" ]; then if [ -a "$drv" ]; then
NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv" NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv"
buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
else else
echo "nix-instantiate failed" echo "nix-instantiate failed"