X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=testing%2Fscripts%2Fstart-umls;h=f9578d751f4ad3b54153f0230ef6947725a14eb8;hp=3c13523cf042a823a896e438d54c653dfc48d1af;hb=f9df3d06b5b4e5e5f00d294f555a373afd6bf99e;hpb=90b21fde11067943e930b8af694b6e9af1fb9c08

diff --git a/testing/scripts/start-umls b/testing/scripts/start-umls
index 3c13523..f9578d7 100755
--- 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"
-        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
 
@@ -107,6 +95,7 @@ do
     else
 	cgecho "up"
     fi
+
 done
 
 cecho " * All uml instances are up now"