X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=7db9fc34c809135ee1cc62e15d056265883e3fcd;hb=63bec23c89fff5068a1550680c139063080db237;hp=41d92f5f227174152b48c439389f452356f99a3c;hpb=04eef922e2badb6085beb461bd4a2c492a50516c;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index 41d92f5..7db9fc3 100755
--- a/build.sh
+++ b/build.sh
@@ -53,6 +53,8 @@ vstubdir=$PWD/vservers/.vstub/${slicefamily}
 
 # Make /vservers and default vserver reference image
 install -d -m 755 ${vref}
+# needed for pldistros that don't have any system vserver images
+install -d -m 755 ${vstubdir}
 
 # Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
 # unless the installation is running inside the BootCD environment. We
@@ -89,11 +91,14 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null
 
     # Install the system vserver specific packages
     [ -n "$systempackages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $systempackages
-    [ -n "$systemgroups" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+    for group_plus in $systemgroups; do
+	group=$(echo $group_plus | sed -e "s,+++, ,g")
+        yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group"
+    done
 
     pkgsdir=$(dirname $pkgsfile)
     pkgsname=$(basename $pkgsfile .pkgs)
-    postfile="${pkgsdir}/${pkgsname}.post"
+    postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${pkgsname}.post")
     [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
 
     # Create a copy of the system vserver w/o the vserver reference files and make it smaller. 
@@ -127,7 +132,7 @@ done
 
 pkgsdir=$(dirname $pkgsfile)
 pkgsname=$(basename $pkgsfile .pkgs)
-postfile="${pkgsdir}/${pkgsname}.post"
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${pkgsname}.post")
 [ -f $postfile ] && /bin/bash $postfile ${vref} || :
 
 # fix sudoers config