abort if fatal error is received from peer

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

diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index a533fb7..18dc64a 100755 (executable)
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -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: kstart-umls,v 1.6 2005/08/30 22:13:12 as Exp $
 
 DIR=`dirname $0`
 
@@ -35,6 +33,12 @@ BOOTING_HOSTS=""
 count_max=12
 count=0
 
+#position of konsole window on the desktop
+x0=8
+y0=8
+dx=12
+dy=24
+
 for host in $HOSTS
 do
     up=0
@@ -57,13 +61,16 @@ do
        [ -f  $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found"
 
        cecho-n " * Starting ${host}.."
-       eval konsole -title ${host} -e "$UMLKERNEL \
+       eval konsole -title ${host} --geometry "+${x0}+${y0}" -e "$UMLKERNEL \
            umid=${host} \
            ubda=$UMLHOSTFS \
            \$SWITCH_${host} \
            mem=${MEM}M con=pty con0=fd:0,fd:1" &
-        cecho "done"
+        cgecho "done"
+        sleep 15
     fi
+    let "x0+=dx"
+    let "y0+=dy"
 done
 
 if [ -z "$BOOTING_HOSTS" ]
@@ -90,14 +97,13 @@ do
        exit 1
     fi
 
-    pid=`cat ~/.uml/$host/pid`
-    up=`ps up $pid | grep agetty | wc -l`
+    up=`uml_mconsole $host proc net/route 2> /dev/null | grep eth0 | wc -l`
 
     while [ $count -lt $count_max ] && [ $up -eq 0 ]
     do
        cecho-n "."
        sleep 5
-       up=`ps up $pid | grep agetty | wc -l`
+       up=`uml_mconsole $host proc net/route 2> /dev/null | grep eth0 | wc -l`
        let "count+=1"
     done
 
@@ -106,7 +112,14 @@ do
        cecho "exit"
        exit 1
     else
-       cecho "up"
+       cgecho "up"
+    fi
+
+    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
 done