the very same sed command is run by config.planetlab/vserver.post

[vserver-reference.git] / build.sh

diff --git a/build.sh b/build.sh
index 9984e7a..7db9fc3 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -91,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. 
@@ -129,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