From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Wed, 7 Nov 2007 14:33:28 +0000 (+0000)
Subject: changes the way vbuild.setup is invoked
X-Git-Tag: foo~409
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4205dba352e8b467b84cb437f26e13f09a4229ae;p=infrastructure.git

changes the way vbuild.setup is invoked
---

diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh
index e2de083..e04ddad 100755
--- a/scripts/nightly-build-vserver.sh
+++ b/scripts/nightly-build-vserver.sh
@@ -3,7 +3,7 @@ REVISION=$(echo '$Revision$' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
 
 COMMANDPATH=$0
 COMMAND=$(basename $0)
-ROOT=/build
+#ROOT=/build
 
 # default values, tunable with command-line options
 DEFAULT_FC_DISTRO=fc6
@@ -114,7 +114,7 @@ function runtest () {
 }
 
 function show_env () {
-    echo ROOT=$ROOT
+#    echo ROOT=$ROOT
     echo FC_DISTRO=$FC_DISTRO
     echo DISTRO=$DISTRO
     echo BASE=$BASE
@@ -219,7 +219,7 @@ function main () {
             # Create vserver
 	    cd /tmp
 	    chmod +x vbuild-$$
-	    /tmp/vbuild-$$ ${BASE} ${FC_DISTRO} ${DISTRO}-devel  >> $LOG 2>&1
+	    /tmp/vbuild-$$ ${BASE} ${FC_DISTRO} ${DISTRO} >> $LOG 2>&1
 	    cd -
 	    # Extract build
 	    vserver ${BASE} exec svn checkout ${SVNPATH} /build  >> $LOG 2>&1