X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=54946d47685ed53864fcd4f2ec615441f1d00ff0;hb=8706009e555bb9fa04a5679e4be2c7c67506802b;hp=c4ee1c3d09eb7f28ec99ff45c2b3cd782e864f48;hpb=928b0b79473d54e2be010318f6024d02af1d0b4d;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index c4ee1c3d0..54946d476 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -33,7 +33,7 @@ else
 SSH_KEY_OPTION ?= -i $(SSH_KEY)
 endif
 
-SSH_OPTIONS ?= $(SSH_KEY_OPTION) -l $(SLICE)
+SSH_OPTIONS ?= $(SSH_KEY_OPTION) -l $(SLICE) -t
 SSH = ssh $(SSH_OPTIONS)
 
 ALL_NODE_IDS=$(shell (cut -d- -f1 < links; cut -d- -f2 < links) | sort -u)
@@ -72,6 +72,7 @@ cache/host.%:
 	@host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
 
 cache/db.%:
+<<<<<<< HEAD
 	@echo "Starting db server on $(call display,$*)"
 	@$(SSH) $(HOST_$*) sudo start_ovsdb-server > $@ \
 	 || { rm $@; exit 1; }