X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=646a2ec2e6a12c8f3c137d90532c8d6a27a5eaad;hb=18991130cb89580997b7d86d95a1314c9b56ed3d;hp=8bfbb5a57bbb73adf608614849bd5624ede5bec8;hpb=a26df2ba741f55e6eb1fb0003a798959ba624090;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 8bfbb5a..646a2ec 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # 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,9 +60,7 @@ 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"
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post || : )
 [ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; }
 
 displayed=""
@@ -96,7 +94,11 @@ pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
 
     # Install the system vserver specific packages
     [ -n "$packages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $packages
-    [ -n "$groups" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall $groups
+    for group_plus in $groups; do
+	group=$(echo $group_plus | sed -e "s,+++, ,g")
+        yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group"
+    done
+
 
     if [ -f "${vdir}/proc/cpuinfo" ] ; then
         echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
@@ -105,11 +107,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