From 22d5642fc484bec5e31e25b0e8b2ba4a97887c9d Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 18 Jul 2008 18:31:22 +0000 Subject: [PATCH] due to a %^!&@^ feature in the latest version of yum we are creating a /vservers directory within a vserver. This throws off the vbuild-nightly, as it checks whether it is operating within a vserver by checking for the existence of the /vservers directory. Changed it to check for /etc/vservers instead, which isn't exactly the best test either. It would be better if one could easily check whether one was running inside the root context or inside a vserver. --- vbuild-nightly.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh index 56167d69..d295fc5b 100755 --- a/vbuild-nightly.sh +++ b/vbuild-nightly.sh @@ -242,7 +242,7 @@ function show_env () { echo TAGSRELEASE="$TAGSRELEASE" echo -n "(might be unexpanded)" echo WEBPATH="$WEBPATH" - if [ -d /vservers ] ; then + if [ -d /etc/vservers ] ; then echo PLDISTROTAGS="$PLDISTROTAGS" else echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS" @@ -344,7 +344,7 @@ function main () { BASE=$(echo ${BASE} | sed $sedargs) WEBPATH=$(echo ${WEBPATH} | sed $sedargs) - if [ ! -d /vservers ] ; then + if [ ! -d /etc/vservers ] ; then # in the vserver echo "==================== Within vserver BEG $(date)" build -- 2.47.0