Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -61,10 +61,12 @@
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
 	       ;; (runremote (assoc/default 'runremote cmdinfo))
 	       (transport (assoc/default 'transport cmdinfo))
+	       (serverinf (assoc/default 'serverinf cmdinfo))
+	       (port      (assoc/default 'port      cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (target    (assoc/default 'target    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (env-ovrd  (assoc/default 'env-ovrd  cmdinfo))
@@ -585,10 +587,11 @@
 		    (with-output-to-string
 		      (lambda () ;; (list 'hosts     hosts)
 			(write (list (list 'testpath  test-path)
 				     ;; (list 'runremote *runremote*)
 				     (list 'transport (conc *transport-type*))
+				     (list 'serverinf *server-info*)
 				     (list 'toppath   *toppath*)
 				     (list 'work-area work-area)
 				     (list 'test-name test-name) 
 				     (list 'runscript runscript) 
 				     (list 'run-id    run-id   )