From befac29d132ef957e2d564a6ace7ff0b0bb2b597 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Thu, 8 Nov 2007 15:52:59 +0000 Subject: [PATCH] * call pl_mkfedora directly rather than pl_setup_chroot * use the build.common pl_get{Packages,Groups} functions --- build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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}/* -- 2.43.0