From: Barış Metin Date: Tue, 20 Oct 2009 11:01:29 +0000 (+0000) Subject: the very same sed command is run by config.planetlab/vserver.post X-Git-Tag: VserverReference-4.2-16~3 X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=63bec23c89fff5068a1550680c139063080db237 the very same sed command is run by config.planetlab/vserver.post use pl_locateDistroFile to locate the postfile --- 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