X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=7ecf15a9fafba3f99f19a0918580b94331d7282c;hb=bcf330467280e1ce306062b92565199721e57cff;hp=8b27508351521bec5ac135c315617efd1e98b096;hpb=82b2f53d6dc15c3a4484f376ed7a2a9e82f1727d;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 8b27508..7ecf15a 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,6 +62,8 @@ pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
 # -k = exclude kernel* packages
 pl_root_mkfedora -k -f $pkgsfile ${vref} 
 
+# for distros that do not define bootstrapfs variants
+shopt -s nullglob
 for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
 
@@ -86,9 +96,13 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     for service in util-vserver vprocunhide vservers-default; 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
+    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
@@ -117,7 +131,7 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     rm -rf ${vdir}
     rm -f  ${vdir}.changes
     mv ${vdir}-tmp ${vdir}
-
+    
     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)"