From e8402b81d4c565334f9dbdeb0e0d40efb3ad1abd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 6 Sep 2012 18:04:19 +0200 Subject: [PATCH] stores command logs in separate file, not the make target itself --- planetlab/exp-tool/Makefile | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) 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 -- 2.43.0