no longer overwrite guest's /etc/yum.conf with the version from the host

[sliceimage.git] / build.sh

diff --git a/build.sh b/build.sh
index 400dc5b..28e23c3 100755 (executable)
--- 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,6 +92,11 @@ 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: