foo.diff

diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab
index 08acc4e..176cc1b 100644
--- a/dist/testbed-support/Makefile.iotlab
+++ b/dist/testbed-support/Makefile.iotlab
@@ -9,8 +9,7 @@ IOTLAB_EXP_ID       ?= $(shell experiment-cli get -l --state Running | grep -m 1
 IOTLAB_EXP_NAME     ?= RIOT_EXP
 IOTLAB_DEBUG_PORT   ?= 3333
 IOTLAB_DEBUG_NODE   ?= $(shell experiment-cli get -i $(IOTLAB_EXP_ID) --resources | \
-                         grep -m 1 "network_address" | sed 's/.*: "\(.*\)".*/\1/')
-IOTLAB_LOGGING      ?= 0
+                         grep -m 1 "network_address" | sed 's/.*-\([0-9]*\)\..*/\1/')
 
 IOTLAB_AUTHORITY    = "$(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info"
 
@@ -75,21 +74,12 @@ iotlab-stop: $(IOTLAB_AUTH) iotlab-check-exp
 iotlab-term: iotlab-check-exp
        $(AD)ssh -t $(IOTLAB_AUTHORITY) "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)"
 
-    ifndef NODES_PARAM
-           $(AD)ssh -t $(IOTLAB_AUTHORITY)\
-           "tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID)\
-           '$(if $(IOTLAB_LOGGING),\
-           script -fac "'"'"serial_aggregator -i $(IOTLAB_EXP_ID)"'"'"\
-           RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID),\
-           serial_aggregator -i $(IOTLAB_EXP_ID))'"
-    else
-           $(AD)ssh -t $(IOTLAB_AUTHORITY)\
-           "tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID)\
-           '$(if $(IOTLAB_LOGGING),\
-           script -fac "'"'"serial_aggregator $(NODES_PARAM_BASE)"'"'"\
-           RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID),\
-           serial_aggregator $(NODES_PARAM_BASE))'"
-    endif
+       $(AD)ssh -t $(IOTLAB_AUTHORITY) \
+       "tmux attach -t riot-$(IOTLAB_EXP_ID) || tmux new -s riot-$(IOTLAB_EXP_ID) \
+       '$(if $(IOTLAB_LOGGING), \
+       script -fac "'"'"serial_aggregator -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE)"'"'" \
+       RIOT_LOG-$(IOTLAB_EXP_NAME)-$(IOTLAB_EXP_ID), \
+       serial_aggregator -i $(IOTLAB_EXP_ID) $(NODES_PARAM_BASE))'"
 
 iotlab-check-exp:
 ifndef IOTLAB_SITE