From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 11 Jan 2007 20:07:05 +0000 (-0000)
Subject: use uml_mconsole to check end of booting process
X-Git-Tag: 4.0.7~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=053ce451b19ae84c807ff6920b10efb30d8e0aa4;p=thirdparty%2Fstrongswan.git

use uml_mconsole to check end of booting process
---

diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index a533fb7281..8379438c89 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -35,6 +35,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 +63,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"
     fi
+    let "x0+=dx"
+    let "y0+=dy"
+    sleep 15
 done
 
 if [ -z "$BOOTING_HOSTS" ]
@@ -90,14 +99,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
 
diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index f51791dfae..1b875a6964 100755
--- a/testing/scripts/start-umls
+++ b/testing/scripts/start-umls
@@ -90,14 +90,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
 
diff --git a/testing/scripts/xstart-umls b/testing/scripts/xstart-umls
index 13c5d10a1a..9efbd1497b 100755
--- a/testing/scripts/xstart-umls
+++ b/testing/scripts/xstart-umls
@@ -35,6 +35,12 @@ BOOTING_HOSTS=""
 count_max=12
 count=0
 
+#position of xterm window on the desktop
+x0=8
+y0=8
+dx=12
+dy=24
+
 for host in $HOSTS
 do
     up=0
@@ -57,13 +63,16 @@ do
 	[ -f  $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found"
 
 	cecho-n " * Starting ${host}.."
-	eval xterm -title ${host} -rightbar -sb -sl 500 -e "$UMLKERNEL \
+	eval xterm -title ${host} -geometry "+${x0}+${y0}" -rightbar -sb -sl 500 -e "$UMLKERNEL \
 	    umid=${host} \
 	    ubda=$UMLHOSTFS \
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
         cecho "done"
     fi
+    let "x0+=dx"
+    let "y0+=dy"
+    sleep 15
 done
 
 if [ -z "$BOOTING_HOSTS" ]
@@ -90,14 +99,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