From c657537805236d864ae42b155d4a8f886b9d81bd Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 25 Feb 2008 19:45:57 +0000 Subject: [PATCH] use the default /etc/yum.conf that comes with the yum package --- build.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 28e23c3..4f9b8e3 100755 --- a/build.sh +++ b/build.sh @@ -92,10 +92,10 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups - pkgsdir=$(dirname $pkgsfile) - pkgsname=$(basename $pkgsfile .pkgs) - postfile="${pkgsdir}/${pkgsname}.post" - [ -f $postfile ] && /bin/bash $postfile ${vdir} || : + pkgsdir=$(dirname $pkgsfile) + pkgsname=$(basename $pkgsfile .pkgs) + postfile="${pkgsdir}/${pkgsname}.post" + [ -f $postfile ] && /bin/bash $postfile ${vdir} || : # Create a copy of the system vserver w/o the vserver reference files and make it smaller. # This is a three step process: @@ -103,6 +103,8 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null # step 1: clean out yum cache to reduce space requirements yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all + [ -f ${vdir}/etc/yum.conf.rpmnew ] && mv ${vdir}/etc/yum.conf.rpmnew ${vdir}/etc/yum.conf + # step 2: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes rsync -anv ${vdir}/ ${vref}/ > ${vdir}.changes linecount=$(wc -l ${vdir}.changes | awk ' { print $1 } ') @@ -126,4 +128,7 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null echo "--------DONE BUILDING system vserver ${NAME}: $(date)" done +# switch the vserver reference /etc/yum.conf to the new one from the yum package +[ -f ${vref}/etc/yum.conf.rpmnew ] && mv ${vref}/etc/yum.conf.rpmnew ${vref}/etc/yum.conf + exit 0 -- 2.43.0