X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=a5ccb4010b86a7f9dd68a094d079cee3a583f344;hb=714ea335aa0e47a673b765eb894bc02a39466b05;hp=569dc4776ae1576a75fc0186a750ea17efa806f7;hpb=0e2136c0686aaa3ad1a1d2a5b05942619daee9d4;p=vserver-reference.git diff --git a/build.sh b/build.sh index 569dc47..a5ccb40 100755 --- a/build.sh +++ b/build.sh @@ -96,9 +96,9 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group" done - pkgsdir=$(dirname $pkgsfile) - pkgsname=$(basename $pkgsfile .pkgs) - postfile="${pkgsdir}/${pkgsname}.post" + # search e.g. vserver-planetflow.post in config. or in config.planetlab otherwise + postfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver-${NAME}.post || : ) + [ -f $postfile ] && /bin/bash $postfile ${vdir} || : # Create a copy of the system vserver w/o the vserver reference files and make it smaller. @@ -130,9 +130,9 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null echo "--------DONE BUILDING system vserver ${NAME}: $(date)" done -pkgsdir=$(dirname $pkgsfile) -pkgsname=$(basename $pkgsfile .pkgs) -postfile="${pkgsdir}/${pkgsname}.post" +# search vserver.post in config. or in config.planetlab otherwise +postfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.post) + [ -f $postfile ] && /bin/bash $postfile ${vref} || : # fix sudoers config