X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=ce7faabc8f118672c57e376d16601cf32838ce5f;hb=072165b23b5927f5247d2e74bc243d3d6a4e6e19;hp=ce7e399e07d933799ddf3eb9721bb020c5425611;hpb=befac29d132ef957e2d564a6ace7ff0b0bb2b597;p=nodeimage.git

diff --git a/build.sh b/build.sh
index ce7e399..ce7faab 100755
--- a/build.sh
+++ b/build.sh
@@ -47,6 +47,8 @@ groups=$(pl_getGroups base.lst)
 for package in ${packages} ; do  options="$options -p $package"; done
 for group in ${groups} ; do options="$options -g $group"; done
 
+echo "+++++++++++++OPTIONS = ${options}"
+
 # Populate a minimal /dev and then the files for the base PlanetLab-Bootstrap content
 vref=${PWD}/base
 install -d -m 755 ${vref}
@@ -60,6 +62,7 @@ for bootstrapfs in bootstrap-filesystems/*.lst ; do
     # "Parse" out the packages and groups for yum
     packages=$(pl_getPackages $bootstrapfs)
     groups=$(pl_getGroups $bootstrapfs)
+    echo "${NAME} has the following packages and groups: ${packages} ${groups}"
 
     vdir=${PWD}/bootstrap-filesystems/${NAME}
     rm -rf ${vdir}/*
@@ -70,11 +73,17 @@ for bootstrapfs in bootstrap-filesystems/*.lst ; do
     rm -f ${vdir}/var/lib/rpm/__db*
 
     # Install the system vserver specific packages
-    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
-    [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+    [ -n "$packages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $packages
+    [ -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
+    fi
 
-    # Create a copy of the system vserver w/o the vserver reference files and make it smaller. 
-    # This is a three step process:
+    # Create a copy of the ${NAME} bootstrap filesystem w/o the base
+    # bootstrap filesystem and make it smaller.  This is a three step
+    # process:
 
     # step 1: clean out yum cache to reduce space requirements
     yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
@@ -107,9 +116,9 @@ for bootstrapfs in bootstrap-filesystems/*.lst ; do
 done
 
 # Build the base Bootstrap filesystem
-echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
 # clean out yum cache to reduce space requirements
 yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
+echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
 tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
 echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"