From 26e59ecbb38b68a6b92b71505a8ed07fa9316a52 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 3 Apr 2009 07:45:02 +0000 Subject: [PATCH] locate .post scripts as for .pkgs files, i.e. first in pldistro-dep config dir, then in default config.planetlab --- build.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 8bfbb5a..1adbfa2 100755 --- a/build.sh +++ b/build.sh @@ -60,9 +60,7 @@ pl_root_mkfedora ${vref} ${pldistro} $pkgsfile # optionally invoke a post processing script after packages from # $pkgsfile have been installed -pkgsdir=$(dirname $pkgsfile) -pkgsname=$(basename $pkgsfile .pkgs) -postfile="${pkgsdir}/${pkgsname}.post" +postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post) [ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; } displayed="" @@ -105,11 +103,8 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc # optionally invoke a post processing script after packages from # $pkgs have been installed - pkgsdir=$(dirname $pkgs) - pkgsname=$(basename $pkgs .pkgs) - postfile="${pkgsdir}/${pkgsname}.post" - [ -f $postfile ] && /bin/bash $postfile ${vdir} || : - + postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs-${NAME}.post) + [ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vdir} || : ; } # Create a copy of the ${NAME} bootstrap filesystem w/o the base # bootstrap filesystem and make it smaller. This is a three step -- 2.43.0