X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=db4a4c78f2acf553a2a2d2f2d85955ac778c2927;hb=ecf4b69f3047fe914bbf85f3e6b2f2e6da5dab52;hp=521e45fb73ca90e216c608574e4056c58bb119bf;hpb=23a18e97518e4fdee22505dcbdf9e87546319e43;p=bootstrapfs.git

diff --git a/build.sh b/build.sh
index 521e45f..db4a4c7 100755
--- a/build.sh
+++ b/build.sh
@@ -42,16 +42,17 @@ export PL_BOOTCD=1
 # "Parse" out the packages and groups into the options passed to mkfedora
 # -k = exclude kernel* packages
 options="-k"
-packages=$(pk_getPackages base.lst)
-groups=$(pk_getGroups base.lst)
+packages=$(pl_getPackages base.lst)
+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}
-pl_makedevs ${vref}
-pl_setup_chroot ${vref} -k ${options}
+pl_mkfedora ${vref} ${options}
 
 for bootstrapfs in bootstrap-filesystems/*.lst ; do
     NAME=$(basename $bootstrapfs .lst)
@@ -59,8 +60,9 @@ for bootstrapfs in bootstrap-filesystems/*.lst ; do
     echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    packages=$(grep "^package:.*" $bootstrapfs | awk '{print $2}')
-    groups=$(grep "^group:.*" $bootstrapfs | awk '{print $2}')
+    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}/*
@@ -71,11 +73,12 @@ 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
 
-    # 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