X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=blobdiff_plain;f=build.sh;h=7db9fc34c809135ee1cc62e15d056265883e3fcd;hp=0d39ec83a1a596daaaae701f7d32af38e8f2d860;hb=63bec23c89fff5068a1550680c139063080db237;hpb=bcee3966ef52071c75ea8bfbaec3c74a942914d4 diff --git a/build.sh b/build.sh index 0d39ec8..7db9fc3 100755 --- a/build.sh +++ b/build.sh @@ -98,7 +98,7 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null pkgsdir=$(dirname $pkgsfile) pkgsname=$(basename $pkgsfile .pkgs) - postfile="${pkgsdir}/${pkgsname}.post" + postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${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. @@ -132,11 +132,10 @@ done pkgsdir=$(dirname $pkgsfile) pkgsname=$(basename $pkgsfile .pkgs) -postfile="${pkgsdir}/${pkgsname}.post" +postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${pkgsname}.post") [ -f $postfile ] && /bin/bash $postfile ${vref} || : # fix sudoers config [ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers -[ -f ${vref}/etc/sudoers ] && sed -i 's,^Defaults.*requiretty,#Defaults requiretty,' ${vref}/etc/sudoers exit 0