X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=05508d2c968818beda1acdf4c85bd58554565de3;hb=1df8a90b58c73356b24db58e7ad958b9e299990b;hp=1326a6bc12cc3068e90beb0ab2274bc445050cf8;hpb=33dd6c62507b482717fa522dd736a9b80bf595ef;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 1326a6b..05508d2 100755
--- a/build.sh
+++ b/build.sh
@@ -52,7 +52,7 @@ pl_root_makedevs $vref
 
 pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
 # -k = exclude kernel* packages
-pl_root_mkfedora ${vref} -k -f $pkgsfile 
+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} .