X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=213fe66acd3ea12c9e1bb68450fb78862021aa04;hb=bb1a02a478579bd883cee35f979280c8922f3aed;hp=ded4410414f528b11a33371f04c01cdc92073c62;hpb=e890ad7b125a2cd60c101c78edc91285eda68125;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index ded4410..213fe66 100755
--- a/build.sh
+++ b/build.sh
@@ -62,7 +62,10 @@ 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
+# 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)"
@@ -95,13 +98,6 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
         chroot ${vdir} /sbin/chkconfig $service off
     done
 
-    # Disable splaying of cron.
-    # At this step, vdir is base, and vref is the set of changes that end up in the nodegroup
-    echo > ${vdir}/etc/sysconfig/crontab
-
-    # Add site_admin account
-    chroot ${vdir} /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
     # process:
@@ -139,6 +135,13 @@ 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
+
+# Disable splaying of cron.
+echo > ${vref}/etc/sysconfig/crontab
+
+# Add site_admin account
+chroot ${vref} /usr/sbin/useradd -p "" -u 502 -m site_admin
+
 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)"