@@ -35,14 +35,17 @@
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
 ;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
+(declare (uses dbfile))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
+
+(import dbfile)
 
 (require-library stml)
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
@@ -464,11 +467,13 @@
 	  (begin
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
 	    (set! *dbstruct-dbs*  (db:setup #t)) ;;  run-id)) FIXME!!!
 	    (set! server-going #t)
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
-	    (thread-start! *watchdog*)))
+	    (thread-start! *watchdog*))
+	  (if *no-sync-db*
+	      (db:run-lock-and-sync *no-sync-db*)))
       
       ;; when things go wrong we don't want to be doing the various queries too often
       ;; so we strive to run this stuff only every four seconds or so.
       (let* ((sync-time (- (current-milliseconds) start-time))
 	    (rem-time  (quotient (- 4000 sync-time) 1000)))
@@ -490,11 +495,10 @@
 	    (debug:print-info 0 *default-log-port* "WARNING: interface changed, refreshing iface and port info")
 	    (set! iface new-iface)
 	    (set! port  new-port)
              (if (not *server-id*)
               (set! *server-id* (server:mk-signature)))
-            (debug:print-info 0 *default-log-port* (current-seconds)" "(current-directory)" " (current-process-id) (argv))
 	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
 	    (flush-output *default-log-port*)))
       
       ;; Transfer *db-last-access* to last-access to use in checking that we are still alive
       (mutex-lock! *heartbeat-mutex*)
@@ -503,11 +507,10 @@
       
       (if (common:low-noise-print 120 (conc "server running on " iface ":" port))
 	  (begin
              (if (not *server-id*)
               (set! *server-id* (server:mk-signature)))
-            (debug:print 0 *default-log-port* (current-seconds) (current-directory) (current-process-id) (argv))   
 	    (debug:print 0 *default-log-port* "SERVER STARTED: " iface ":" port " AT " (current-seconds) " server-id: " *server-id*)
 	    (flush-output *default-log-port*)))
       (if (common:low-noise-print 60 "dbstats")
 	  (begin
 	    (debug:print 0 *default-log-port* "Server stats:")