Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

3 files changed, 22 insertions, 2 deletions

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index e22b65cf4..023b71750 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -202,6 +202,16 @@ then
     echo -n " --enable-tnccs-11" >> $INSTALLSHELL
 fi
 
+if [ "$USE_TNCCS_20" = "yes" ]
+then
+    echo -n " --enable-tnccs-20" >> $INSTALLSHELL
+fi
+
+if [ "$USE_TNCCS_DYNAMIC" = "yes" ]
+then
+    echo -n " --enable-tnccs-dynamic" >> $INSTALLSHELL
+fi
+
 if [ "$USE_SQL" = "yes" ]
 then
     echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
@@ -292,6 +302,16 @@ then
     echo -n " --enable-gcm" >> $INSTALLSHELL
 fi
 
+if [ "$USE_HA" = "yes" ]
+then
+    echo -n " --enable-ha" >> $INSTALLSHELL
+fi
+
+if [ "$USE_CISCO_QUIRKS" = "yes" ]
+then
+    echo -n " --enable-cisco-quirks" >> $INSTALLSHELL
+fi
+
 echo "" >> $INSTALLSHELL
 echo "make -j" >> $INSTALLSHELL
 echo "make install" >> $INSTALLSHELL
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index 486955a69..18dc64a9d 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -67,10 +67,10 @@ do
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
         cgecho "done"
+        sleep 15
     fi
     let "x0+=dx"
     let "y0+=dy"
-    sleep 15
 done
 
 if [ -z "$BOOTING_HOSTS" ]
diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls
index 717199606..ed2662b6c 100755
--- a/testing/scripts/xstart-umls
+++ b/testing/scripts/xstart-umls
@@ -67,10 +67,10 @@ do
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
         cgecho "done"
+        sleep 15
     fi
     let "x0+=dx"
     let "y0+=dy"
-    sleep 15
 done
 
 if [ -z "$BOOTING_HOSTS" ]