moved site admin down so as not to get in the vref. Also disabled 000-delay.cron.

[bootstrapfs.git] / build.sh

diff --git a/build.sh b/build.sh
index 7b0056b..05508d2 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -43,16 +43,16 @@ set -e
 # would like to pretend that we are.
 export PL_BOOTCD=1
 
-# "Parse" out the packages and groups into the options passed to mkfedora
-# -k = exclude kernel* packages
-pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
-
 echo "+++++++++++++pkgsfile=$pkgsfile (and -k)"
 
 # Populate a minimal /dev and then the files for the base PlanetLab-Bootstrap content
 vref=${PWD}/base
 install -d -m 755 ${vref}
-pl_mkfedora ${vref} -k -f $pkgsfile 
+pl_root_makedevs $vref
+
+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
     NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
@@ -78,10 +78,15 @@ 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
+
     # 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,6 +114,13 @@ for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
     rm -rf ${vdir}
     rm -f  ${vdir}.changes
     mv ${vdir}-tmp ${vdir}
+    
+    # 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} .