merged from trunk

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 8234065..31514cb 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -299,6 +299,9 @@ function post_install_myplc  () {
     # create symlink for /dev/fd
     [ ! -e "/dev/fd" ] && ln -s /proc/self/fd /dev/fd
 
+    # turn off regular crond, as plc invokes plc_crond
+    chkconfig crond off
+
     # customize root's prompt
     cat << PROFILE > /root/.profile
 export PS1="[$vserver] \\w # "

diff --git a/vtest-nightly.sh b/vtest-nightly.sh
index 30d3163..b50e621 100644 (file)
--- a/vtest-nightly.sh
+++ b/vtest-nightly.sh
@@ -187,7 +187,7 @@ function main () {
     svn export $SVNPATH $tmpdir
     # Create vserver
     cd $tmpdir
-    ./vtest-init-vserver.sh -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL}
+    ./vtest-init-vserver.sh -i eth${TESTVSERVER_DEV} -f ${FCDISTRO} -d ${PLDISTRO} -p ${PERSONALITY} ${BASE} ${REPOURL}
     # cleanup
     cd -
     rm -rf $tmpdir