for got $

[bootstrapfs.git] / build.sh

diff --git a/build.sh b/build.sh
index 75292e6..d1d9caa 100755 (executable)
--- 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)"
@@ -96,10 +99,11 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     done
 
     # Disable splaying of cron.
-    echo > ${vref}/etc/sysconfig/crontab
+    # 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 ${vref} /usr/sbin/useradd -p "" -u 502 -m site_admin
+    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