X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=0a6c5575579ba4f45713beb26084826f17cbd0f8;hb=dcd6256870c21a1e569a380d9146c7a4aac4a08c;hp=38c60a3c08b8fd24c0c843e22b39721d8c3f3341;hpb=9e80499f8a236d877178158a3fb730dcfff1850b;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 38c60a3..0a6c557 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,14 @@
 # $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $
 #
 
+
+#
+# This will build the Planetlab-Bootstrap.tar.bz2, which comprises
+# the base root image on the node, then create the ${NAME} bootstrap image
+# which is made up of just the additional files needed for a ${NAME} nodegroup 
+# node.
+#
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 # In both a normal CVS environment and a PlanetLab RPM
@@ -54,7 +62,13 @@ pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
 # -k = exclude kernel* packages
 pl_root_mkfedora -k -f $pkgsfile ${vref} 
 
-for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
+[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || :
+
+# for distros that do not define bootstrapfs variants
+shopt -s nullglob
+pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
+[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
     NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
 
     echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
@@ -82,10 +96,9 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
         umount ${vdir}/proc
     fi
 
-    # Remove unneeded services
-    for service in util-vserver vprocunhide vservers-default; do
-        chroot ${vdir} /sbin/chkconfig $service off
-    done
+    postfile=$(echo $pkgs | sed -e s,pkgs,post, )
+	[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /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
@@ -124,6 +137,7 @@ done
 # Build the base Bootstrap filesystem
 # clean out yum cache to reduce space requirements
 yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
+
 echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
 tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
 echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"