previous change trashed the -k option to mkfedora

[bootstrapfs.git] / build.sh

diff --git a/build.sh b/build.sh
index 8537636..ed99814 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -45,12 +45,11 @@ export PL_BOOTCD=1
 
 # "Parse" out the packages and groups into the options passed to mkfedora
 # -k = exclude kernel* packages
-options="-k"
 lst="${pldistro}-base.lst"
 popts=$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst)
 gopts=$(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)
 
-options="${popts} ${gopts}"
+options="${popts} ${gopts} -k"
 
 echo "+++++++++++++OPTIONS = ${options}"
 
@@ -65,8 +64,8 @@ for lst in ${pldistro}-filesystems/*.lst ; do
     echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    packages=$(pl_getPackages $lst)
-    groups=$(pl_getGroups $lst)
+    packages=$(pl_getPackages2 ${pl_DISTRO_NAME} $lst)
+    groups=$(pl_getGroups2 ${pl_DISTRO_NAME} $lst)
     echo "${NAME} has the following packages and groups: ${packages} ${groups}"
 
     vdir=${PWD}/${pldistro}-filesystems/${NAME}