X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=d1d9caaf26bc4c2b7a0ba1b16cc2ce330f464536;hb=67ee6f71546f501094d23c2cc469a18d1ced3877;hp=a5b95f4ac0ffc06584f1d7922a24187b83689beb;hpb=a1ac7628c5dde1200ef2e4a8531e3c8afc3c8e6b;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index a5b95f4..d1d9caa 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,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)"
@@ -87,6 +98,13 @@ 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:
@@ -115,14 +133,6 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     rm -f  ${vdir}.changes
     mv ${vdir}-tmp ${vdir}
     
-    ### Thierry : there's no useradd in vdir at this stage - it was just cleaned up
-    ### # Add site_admin account
-    ### chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
-    ### 
-    # Disable /etc/cron.*/000-delay.cron.  Used to splay crons.  PL crons
-    # already do this.
-    echo > ${vdir}/etc/sysconfig/crontab
-
     echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
     tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
     echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"