abort if fatal error is received from peer

[strongswan.git] / testing / scripts / gstart-umls

diff --git a/testing/scripts/gstart-umls b/testing/scripts/gstart-umls
index 90d2e21..c6fcd26 100755 (executable)
--- a/testing/scripts/gstart-umls
+++ b/testing/scripts/gstart-umls
@@ -1,5 +1,5 @@
 #!/bin/bash
-# starts the UML instances in an xterm (requires X11R6)
+# starts the UML instances in an gnome-terminal (requires X11R6)
 #
 # Copyright (C) 2004  Eric Marchionni, Patrik Rayo
 # Zuercher Hochschule Winterthur
@@ -13,8 +13,6 @@
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-#
-# RCSID $Id: xstart-umls 3273 2007-10-08 20:18:34Z andreas $
 
 DIR=`dirname $0`
 
@@ -63,16 +61,16 @@ do
        [ -f  $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found"
 
        cecho-n " * Starting ${host}.."
-       eval gnome-terminal --title=${host} --geometry="+${x0}+${y0}" -show-menubar --execute "$UMLKERNEL \
+       eval gnome-terminal --title=${host} --geometry="+${x0}+${y0}" --show-menubar --execute "$UMLKERNEL \
             umid=${host} \
            ubda=$UMLHOSTFS \
            \$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" ]
@@ -119,6 +117,7 @@ do
 
     if [ "$host" = "alice" ]
     then
+       sleep 5
        eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
        ssh root@$ipv4_alice /etc/init.d/net.eth1 stop
     fi