X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=f1a0657d2af11971ff730fa7757092c7e1c90371;hb=b4f19098a0c1ffdcb0ac900f068ecf07eab4cb7f;hp=b426b16c978c081f78dedec24a26045e51661111;hpb=2ef82c0d430621a1dd23e5e142728df9de7a8739;p=sliceimage.git diff --git a/build.sh b/build.sh index b426b16..f1a0657 100755 --- a/build.sh +++ b/build.sh @@ -59,10 +59,16 @@ install -d -m 755 ${vref} # locate the packages and groups file pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs) +# Some of the PlanetLab RPMs attempt to (re)start themselves in %post, +# unless the installation is running inside the BootCD environment. We +# would like to pretend that we are. +export PL_BOOTCD=1 + # Populate image with vserver-reference packages pl_root_setup_chroot ${vref} -k -f $pkgsfile -for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do +systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null | wc -l) +[ $systemvserver_count -gt 0 ] && for systemvserver in $(ls ../build/config.${pldistro}/vserver-*.pkgs) ; do NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,) echo "--------START BUILDING system vserver ${NAME}: $(date)"