X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=ee89cdf3a9986c0780504899ff0c7667e247c972;hb=6d7b4f6d3f5d8a04d2a8a995d82bb7e4288ab066;hp=49b20f0440213a0af2d020e5ae477b6a6ec2241d;hpb=d4a1143c080fe558b043895dd721efa8f7b3b8d0;p=bootstrapfs.git diff --git a/build.sh b/build.sh index 49b20f0..ee89cdf 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 @@ -142,7 +137,7 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc echo -n "* tar $extension_name s=$(date +%H-%M-%S)" tar -cpf ${pldistro}-filesystems/$extension_plain -C ${vdir} . echo -n " m=$(date +%H-%M-%S) " - bzip2 --compress --stdout $extension_plain > $extension_name + bzip2 --compress --stdout ${pldistro}-filesystems/$extension_plain > ${pldistro}-filesystems/$extension_name echo " e=$(date +%H-%M-%S) " done