X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fexp-tool%2FMakefile;h=eda603f3915a3afe618187ac871b934d779a9d76;hb=e8402b81d4c565334f9dbdeb0e0d40efb3ad1abd;hp=d880cd604de6c91f570af0e7606ec00ac2c0b8f8;hpb=c850fe351187eaf5a9f8afd337202a677e7e6c54;p=sliver-openvswitch.git

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index d880cd604..eda603f39 100644
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -75,28 +75,26 @@ switchs: $(foreach id,$(ALL_NODE_IDS),cache/switch.$(id))
 .PHONY: switchs
 
 ### node-oriented targets
+# check ssh connectivity
+cache/sshcheck.%: FORCE
+	@if $(SSH) $(HOST_$*) hostname 2> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
+	 else echo "ssh on" $(call display,$*) "KO !!!"; fi
+
 cache/host.%:
 	@echo "IP lookup for $(call display,$*)"
 	@host $(HOST_$*) | sed -n 's/^.*has address *//p' > $@
 
 cache/db.%:
-	@echo "Starting db server on $(call display,$*)"
-	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-db > $@ \
-	 || { rm $@; exit 1; }
+	@echo "Starting db server on $(call display,$*) - logs in $@.log"
+	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-db &> $@.log && touch $@
 
 cache/switch.%: cache/db.%
-	@echo "Starting vswitchd on $(call display,$*)"
-	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-switch > $@ \
-	 || { rm $@; exit 1; }
+	@echo "Starting vswitchd on $(call display,$*) - logs in $@.log"
+	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs start-switch &> $@.log && touch $@
 
 cache/bridge.%: cache/switch.%
-	@echo "Creating bridge on $(call display,$*)"
-	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs create-bridge $(IP_$*) > $@ \
-	 || { rm $@; exit 1; }
-
-cache/sshcheck.%: FORCE
-	@if $(SSH) $(HOST_$*) hostname 2> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
-	 else echo "ssh on" $(call display,$*) "KO !!!"; fi
+	@echo "Creating bridge on $(call display,$*) - logs in $@.log"
+	@$(SSH) $(HOST_$*) $(SUDO) sliver-ovs create-bridge $(IP_$*) > $@.log && touch $@
 
 ### link-oriented targets
 L/%: cache/link.%@1 cache/link.%@2