git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
planetlab
/
exp-tool
/
Makefile
diff --git
a/planetlab/exp-tool/Makefile
b/planetlab/exp-tool/Makefile
index
c4ee1c3
..
54946d4
100644
(file)
--- a/
planetlab/exp-tool/Makefile
+++ b/
planetlab/exp-tool/Makefile
@@
-33,7
+33,7
@@
else
SSH_KEY_OPTION ?= -i $(SSH_KEY)
endif
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)
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.%:
@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; }
@echo "Starting db server on $(call display,$*)"
@$(SSH) $(HOST_$*) sudo start_ovsdb-server > $@ \
|| { rm $@; exit 1; }