Rename build-umlkernel script to build-guestkernel

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

diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index f51791d..f9578d7 100755 (executable)
--- a/testing/scripts/start-umls
+++ b/testing/scripts/start-umls
@@ -13,16 +13,8 @@
 # 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: start-umls,v 1.5 2005/08/30 22:13:12 as Exp $
-
-DIR=`dirname $0`
-
-source $DIR/function.sh
 
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 if [ "$#" -eq 0 ]
 then
@@ -44,7 +36,7 @@ do
        pid=`cat ~/.uml/${host}/pid`
        up=`ps up $pid | wc -l`
     fi
-    
+
     if [ $up -eq 2 ]
     then
        cecho " * Great, ${host} is already running!"
@@ -53,16 +45,12 @@ do
        BOOTING_HOSTS="$BOOTING_HOSTS ${host}"
        let "count_max += 12"
 
-       UMLHOSTFS=$BUILDDIR/root-fs/gentoo-fs-${host}
+       UMLHOSTFS=$BUILDDIR/root-fs/${host}.img
        [ -f  $UMLHOSTFS ] || die "!! uml root file system '$UMLHOSTFS' not found"
 
        cecho-n " * Starting ${host}.."
-       eval screen -dmS ${host} "$UMLKERNEL \
-           umid=${host} \
-           ubda=$UMLHOSTFS \
-           \$SWITCH_${host} \
-           mem=${MEM}M con=pty con0=fd:0,fd:1"
-        cecho "done"
+       eval setsid $UMLKERNEL umid=${host} ubda=$UMLHOSTFS \$SWITCH_${host} mem=${MEM}M con=null con1=xterm >>$LOGFILE 2>&1 &
+       cgecho "done"
     fi
 done
 
@@ -90,14 +78,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,8 +93,9 @@ do
        cecho "exit"
        exit 1
     else
-       cecho "up"
+       cgecho "up"
     fi
+
 done
 
 cecho " * All uml instances are up now"