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

diff --git a/build.sh b/build.sh
index ed99814..1326a6b 100755
--- a/build.sh
+++ b/build.sh
@@ -43,30 +43,27 @@ 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
-lst="${pldistro}-base.lst"
-popts=$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst)
-gopts=$(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)
-
-options="${popts} ${gopts} -k"
-
-echo "+++++++++++++OPTIONS = ${options}"
+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} ${options}
+pl_root_makedevs $vref
+
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
+# -k = exclude kernel* packages
+pl_root_mkfedora ${vref} -k -f $pkgsfile 
 
-for lst in ${pldistro}-filesystems/*.lst ; do
-    NAME=$(basename $lst .lst)
+for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
+    NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
 
     echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    packages=$(pl_getPackages2 ${pl_DISTRO_NAME} $lst)
-    groups=$(pl_getGroups2 ${pl_DISTRO_NAME} $lst)
-    echo "${NAME} has the following packages and groups: ${packages} ${groups}"
+    packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs)
+    groups=$(pl_getGroups ${pl_DISTRO_NAME} $pkgs)
+    echo "${NAME} has the following packages : ${packages}"
+    echo "${NAME} has the following groups : ${groups}"
 
     vdir=${PWD}/${pldistro}-filesystems/${NAME}
     rm -rf ${vdir}/*