diff options
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/kstart-umls | 18 | ||||
| -rwxr-xr-x | testing/scripts/start-umls | 7 | ||||
| -rwxr-xr-x | testing/scripts/xstart-umls | 18 |
3 files changed, 29 insertions, 14 deletions
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls index a533fb728..21baee52c 100755 --- a/testing/scripts/kstart-umls +++ b/testing/scripts/kstart-umls @@ -14,7 +14,7 @@ # 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 $ +# RCSID $Id: kstart-umls,v 1.7 2007/01/11 20:32:01 as Exp $ DIR=`dirname $0` @@ -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 f51791dfa..89d9e0d81 100755 --- a/testing/scripts/start-umls +++ b/testing/scripts/start-umls @@ -14,7 +14,7 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # -# RCSID $Id: start-umls,v 1.5 2005/08/30 22:13:12 as Exp $ +# RCSID $Id: start-umls,v 1.6 2007/01/11 20:32:01 as Exp $ DIR=`dirname $0` @@ -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 13c5d10a1..5983d405f 100755 --- a/testing/scripts/xstart-umls +++ b/testing/scripts/xstart-umls @@ -14,7 +14,7 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # -# RCSID $Id: xstart-umls,v 1.6 2005/08/30 22:13:12 as Exp $ +# RCSID $Id: xstart-umls,v 1.7 2007/01/11 20:32:01 as Exp $ DIR=`dirname $0` @@ -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 |