X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=70cb134fff4a48cd3af2a14a176407ad1eb52c41;hb=5f649411973be2bb9a5ad7f995127456374118ce;hp=75292e6777f936a0d9e5e0c38315753fa7bfa387;hpb=54030188086d72dec6bc163e36557b0df94368bb;p=nodeimage.git

diff --git a/build.sh b/build.sh
index 75292e6..70cb134 100755
--- a/build.sh
+++ b/build.sh
@@ -62,7 +62,12 @@ 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
+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)"
@@ -90,16 +95,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
-
-    # Disable splaying of cron.
-    echo > ${vref}/etc/sysconfig/crontab
+    postfile=$(echo $pkgs | sed -e s,pkgs,post, )
+	[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vdir} || :
 
-    # Add site_admin account
-    chroot ${vref} /usr/sbin/useradd -p "" -u 502 -m site_admin
 
     # Create a copy of the ${NAME} bootstrap filesystem w/o the base
     # bootstrap filesystem and make it smaller.  This is a three step
@@ -138,6 +136,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)"