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 018bad0..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$
-
-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"
-        cgecho "done"
+       eval setsid $UMLKERNEL umid=${host} ubda=$UMLHOSTFS \$SWITCH_${host} mem=${MEM}M con=null con1=xterm >>$LOGFILE 2>&1 &
+       cgecho "done"
     fi
 done
 
@@ -108,11 +96,6 @@ do
        cgecho "up"
     fi
 
-    if [ "$host" = "alice" ]
-    then
-       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
 
 cecho " * All uml instances are up now"