@@ -185,10 +185,13 @@
 			"-archive"
 			"-repl"
 			"-lock"
 			"-unlock"
 			"-listservers"
+			;; mist queries
+			"-list-disks"
+			"-list-targets"
 			;; queries
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests
 			"-remove-runs"
@@ -259,19 +262,33 @@
 
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-list-targets")
+    (print (string-intersperse
+	    (sort (map car (hash-table->alist
+			    (read-config "runconfigs.config"
+					 (make-hash-table) #f))) string<?) "\n")))
+
+
+(if (args:get-arg "-list-disks")
+    (print (string-intersperse 
+	    (map cadr (hash-table-ref/default 
+		       (read-config "megatest.config" #f #t) 
+		       "disks" "'" 
+		       ("none" ""))) "\n")))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
 
 (if (args:get-arg "-server")
     (begin
-      (debug:print 1 "Launching server...")
+      (debug:print 2 "Launching server...")
       (server:launch)))
 
 (if (or (args:get-arg "-listservers")
 	(args:get-arg "-killserver"))
     (let ((tl (setup-for-run)))