From 4ae5ab29c29d13490b095d2524b99ea90548437f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 20 Oct 2009 11:12:24 +0000 Subject: [PATCH] turns out baris and I were doing the same change at the same time - this one is simpler --- build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 7db9fc3..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=$(pl_locateDistroFile ../build/ ${pldistro} "${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=$(pl_locateDistroFile ../build/ ${pldistro} "${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 -- 2.43.0