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

diff --git a/build.sh b/build.sh
index 1326a6b..29bdff0 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,18 @@ 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
+    
+    # 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: