X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=build.sh;h=ce7e399e07d933799ddf3eb9721bb020c5425611;hp=df19932f8c5aa87cb5c589ae119b6310ad425cf1;hb=befac29d132ef957e2d564a6ace7ff0b0bb2b597;hpb=bfa515605944ecac41ba601978a77faba510801e

diff --git a/build.sh b/build.sh
index df19932..ce7e399 100755
--- a/build.sh
+++ b/build.sh
@@ -50,8 +50,7 @@ for group in ${groups} ; do options="$options -g $group"; done
 # 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 +58,8 @@ 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)
 
     vdir=${PWD}/bootstrap-filesystems/${NAME}
     rm -rf ${vdir}/*