X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=ded4410414f528b11a33371f04c01cdc92073c62;hb=e890ad7b125a2cd60c101c78edc91285eda68125;hp=1d3da79edc09821d20cb18458ef45d9f5b3cd98c;hpb=44438c0c79216ac2373867793004de033b307e2f;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 1d3da79..ded4410 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
@@ -78,10 +86,22 @@ 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
+    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:
@@ -109,7 +129,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)"