X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=e4f4a1eb38c87c233e754e1732e684a22d5ecbe7;hb=460a95b6828a48c7d7b20372ffbb6c20e4e2142d;hp=0ff9919bf0d599890861b412b4f95ec597e15e8b;hpb=393fddcc5608fb5c8efda16a3729ae0795b074f8;p=nodeimage.git diff --git a/build.sh b/build.sh index 0ff9919..e4f4a1e 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ # Marc E. Fiuczynski # Copyright (C) 2005-2007 The Trustees of Princeton University # -# $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $ +# $Id$ # # @@ -60,10 +60,8 @@ 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" -[ -f $postfile ] && /bin/bash $postfile ${vref} || : +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