X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=68b3997326b3c595f43b8a80faecb185c1c359e7;hb=61a4d93a6a1257e6a179a52d34bbded970a4a18e;hp=f1a0657d2af11971ff730fa7757092c7e1c90371;hpb=b4f19098a0c1ffdcb0ac900f068ecf07eab4cb7f;p=vserver-reference.git diff --git a/build.sh b/build.sh index f1a0657..68b3997 100755 --- a/build.sh +++ b/build.sh @@ -92,12 +92,19 @@ 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} || : + # Create a copy of the system vserver w/o the vserver reference files and make it smaller. # This is a three step process: # 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 -f ${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 } ') @@ -121,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 -f ${vref}/etc/yum.conf.rpmnew ${vref}/etc/yum.conf + exit 0