oops

[build.git] / vbuild-nightly.sh

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 245dd6f..27af613 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-REVISION=$(echo '$Revision: 18120 $' | sed -e 's,\$,,g' -e 's,^\w*:\s,,' )
 
 COMMANDPATH=$0
 COMMAND=$(basename $0)
@@ -283,7 +282,7 @@ function run_log () {
     # toss the build in the bargain, so the tests don't need to mess with extracting it
     rsync --verbose --archive /vservers/$BASE/build/MODULES/build ${testmaster_ssh}:${BASE}/
 
-    # invoke test on testbox - pass url and build url - so the tests can use vtest-init-vserver.sh
+    # invoke test on testbox - pass url and build url - so the tests can use vtest-initvm.sh
     run_log_env="-p $PERSONALITY -d $PLDISTRO -f $FCDISTRO"
 
     # need to proceed despite of set -e
@@ -410,7 +409,6 @@ function setupssh () {
 
 function usage () {
     echo "Usage: $COMMAND [option] [var=value...] make-targets"
-    echo "This is $REVISION"
     echo "Supported options"
     echo " -f fcdistro - defaults to $DEFAULT_FCDISTRO"
     echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
@@ -667,7 +665,7 @@ function main () {
            fi
             # Create vserver
            cd $tmpdir
-           ./vbuild-init-vserver.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} 
+           ./vbuild-initvm.sh $VERBOSE -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} -i ${IFNAME} ${PREINSTALLED} ${BASE} 
            # cleanup
            cd -
            rm -rf $tmpdir
@@ -725,10 +723,10 @@ function main () {
        else
            # run scanpackages so we can use apt-get on this
            # (not needed on fedora b/c this is done by the regular build already)
-           vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > DEBIAN/Packages.gz)"
+           vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > Packages.gz)"
            webpublish mkdir -p $WEBPATH/$BASE/DEBIAN
            webpublish_rsync_files $WEBPATH/$BASE/DEBIAN/ /vservers/$BASE/build/DEBIAN/*.deb 
-           webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/DEBIAN/*.gz
+           webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/Packages.gz
        fi
        # publish myplc-release if this exists
        release=/vservers/$BASE/build/myplc-release