@@ -91,30 +91,33 @@
 
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
 (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
   (assert *toppath* "FATAL: rmt:send-receive called with *toppath* not set.")
-  (if (> attemptnum 2)
-      (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
-  
-  (cond
-   ((> attemptnum 2) (thread-sleep! 0.05))
-   ((> attemptnum 10) (thread-sleep! 0.5))
-   ((> attemptnum 20) (thread-sleep! 1)))
-
-  ;; I'm turning this off, it may make sense to move it
-  ;; into http-transport-handler
-  (if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
+
+  (if (not (eq? (rmt:transport-mode) 'nfs))
       (begin
-	(debug:print 0 *default-log-port* "ERROR: can't connect to server, trying to start a server.")
-	(case (rmt:transport-mode)
-	  ((http)
-	   (server:run *toppath*)
-	   (thread-sleep! 3))
-	  (else
-	   (thread-sleep! 1) ;; for tcp the server is started by routines in tcp-transportmod. For nfs there is no server
-	   ))))
+	(if (> attemptnum 2)
+	    (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
+	
+	(cond
+	 ((> attemptnum 2) (thread-sleep! 0.05))
+	 ((> attemptnum 10) (thread-sleep! 0.5))
+	 ((> attemptnum 20) (thread-sleep! 1)))
+	
+	;; I'm turning this off, it may make sense to move it
+	;; into http-transport-handler
+	(if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
+	    (begin
+	      (debug:print 0 *default-log-port* "ERROR: can't connect to server, trying to start a server.")
+	      (case (rmt:transport-mode)
+		((http)
+		 (server:run *toppath*)
+		 (thread-sleep! 3))
+		(else
+		 (thread-sleep! 1) ;; for tcp the server is started by routines in tcp-transportmod. For nfs there is no server
+		 ))))))
   
   ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
   ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
   ;; 3. do the query, if on homehost use local access
   ;;
@@ -128,14 +131,14 @@
 	 (mtexe         (common:find-local-megatest)))
 
     (case (rmt:transport-mode)
       ((http)(http-transport-handler runremote cmd rid params attemptnum area-dat areapath readonly-mode))
       ((tcp) (tcp-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
-      ((nfs) (nfs:transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
+      ((nfs) (nfs-transport-handler  runremote cmd rid params attemptnum area-dat areapath readonly-mode testsuite mtexe))
       )))
 
-(define (nfs:transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
+(define (nfs-transport-handler  runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)
   (let* ((keys     (common:get-fields *configdat*))
 	 (dbstruct (dbmod:nfs-get-dbstruct run-id keys (dbfile:db-init-proc) areapath)))
     (api:dispatch-request dbstruct cmd run-id params)))
 	 
 (define (tcp-transport-handler runremote cmd run-id params attemptnum area-dat areapath readonly-mode testsuite mtexe)