X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=4f9b8e3b0e237efa8f3dbd30183a1999496f51d3;hb=c657537805236d864ae42b155d4a8f886b9d81bd;hp=f92857e104f398ac52b2c4582d5d3430cae1f7a9;hpb=4ad9d357396c68c7f75b41a4c2c2f1fde262a868;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index f92857e..4f9b8e3 100755
--- a/build.sh
+++ b/build.sh
@@ -92,8 +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
 
-    postfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.post)
-    [ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /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:
@@ -101,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 } ')
@@ -124,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