X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=8b27508351521bec5ac135c315617efd1e98b096;hb=82b2f53d6dc15c3a4484f376ed7a2a9e82f1727d;hp=7b0056ba8b301cf926df2a3c1bdf9d707cdc3772;hpb=ad52c7c072689ee496fe29d7196fe4ed91ffae1f;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 7b0056b..8b27508 100755
--- 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,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: