X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=f1a0657d2af11971ff730fa7757092c7e1c90371;hb=b4f19098a0c1ffdcb0ac900f068ecf07eab4cb7f;hp=18442e62d67dfe7d8912966e3ce62c1b70639d31;hpb=679d015f0f0b82442b83123bec194683aa3ec100;p=sliceimage.git

diff --git a/build.sh b/build.sh
index 18442e6..f1a0657 100755
--- a/build.sh
+++ b/build.sh
@@ -56,16 +56,19 @@ vrefname=default
 vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
-# "Parse" out the packages and groups for mkfedora
+# locate the packages and groups file
 pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
 
-# Populate a minimal /dev in the reference image
-pl_makedevs ${vref}
+# 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_setup_chroot ${vref} -k -f $pkgsfile
+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)"