Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 13899)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 13900)
@@ -2006,5 +2006,6 @@
                 AddEndpoint(tcp::endpoint(endpoint.address(), endpoint.port()+8*i));
 
-            StartConnection();
+            if (conf.Get<bool>("start"))
+                StartConnection();
             return -1;
         }
@@ -2041,5 +2042,6 @@
                 }
 
-            StartConnection();
+            if (conf.Get<bool>("start"))
+                StartConnection();
             return -1;
 
@@ -2060,5 +2062,6 @@
             }
 
-            StartConnection();
+            if (conf.Get<bool>("start"))
+                StartConnection();
             return -1;
         }
@@ -2090,8 +2093,9 @@
     po::options_description connect("FAD connection options");
     connect.add_options()
-        ("addr",        vars<string>(),     "Network address of FAD")
-        ("base-addr",   var<string>(),      "Base address of all FAD")
+        ("addr",        vars<string>(), "Network address of FAD")
+        ("base-addr",   var<string>(),  "Base address of all FAD")
         ("debug-num,n", var<unsigned int>(40),  "Sets the number of fake boards to be connected locally")
-        ("debug-addr",  var<string>(),    "")
+        ("debug-addr",  var<string>(),  "")
+        ("start",       po_bool(false), "Start the connction immediately after boot")
         ;