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

diff --git a/build.sh b/build.sh
index bed9794..213fe66 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)"
@@ -78,13 +89,13 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     [ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups
 
     if [ -f "${vdir}/proc/cpuinfo" ] ; then
-	echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
-	umount ${vdir}/proc
+        echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
+        umount ${vdir}/proc
     fi
 
     # Remove unneeded services
     for service in util-vserver vprocunhide vservers-default; do
-	chroot ${vdir} /sbin/chkconfig $service off
+        chroot ${vdir} /sbin/chkconfig $service off
     done
 
     # Create a copy of the ${NAME} bootstrap filesystem w/o the base
@@ -114,7 +125,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)"
@@ -124,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)"