From 54e536ccaf69979fa69cf3d968da32423ef7abcc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 2 Sep 2008 10:40:37 +0000 Subject: [PATCH] merged from trunk --- vbuild-init-vserver.sh | 3 +++ vtest-nightly.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 82340658..31514cb7 100755 --- 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 30d31634..b50e621c 100644 --- 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 -- 2.47.0