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

diff --git a/build.sh b/build.sh
index 400dc5b..4f9b8e3 100755
--- a/build.sh
+++ b/build.sh
@@ -67,7 +67,8 @@ export PL_BOOTCD=1
 # Populate image with vserver-reference packages
 pl_root_setup_chroot ${vref} -k -f $pkgsfile
 
-for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
+systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null | wc -l)
+[ $systemvserver_count -gt 0 ] && for systemvserver in $(ls ../build/config.${pldistro}/vserver-*.pkgs) ; do
     NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,)
 
     echo "--------START BUILDING system vserver ${NAME}: $(date)"
@@ -91,12 +92,19 @@ for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
     [ -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 ${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 } ')
@@ -120,4 +128,7 @@ for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
     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