X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=90ec95cc4a1b9f6e5c5e2001881b7ff92aea56b8;hb=0cad6286431060d939ce258d7285b92aac0da02c;hp=ce7faabc8f118672c57e376d16601cf32838ce5f;hpb=072165b23b5927f5247d2e74bc243d3d6a4e6e19;p=nodeimage.git

diff --git a/build.sh b/build.sh
index ce7faab..90ec95c 100755
--- a/build.sh
+++ b/build.sh
@@ -31,6 +31,10 @@ pl_process_fedora_options $@
 shiftcount=$?
 shift $shiftcount
 
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
 # Do not tolerate errors
 set -e
 
@@ -42,10 +46,11 @@ export PL_BOOTCD=1
 # "Parse" out the packages and groups into the options passed to mkfedora
 # -k = exclude kernel* packages
 options="-k"
-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
+lst="${pldistro}-base.lst"
+popts=$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst)
+gopts=$(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)
+
+options="${popts} ${gopts}"
 
 echo "+++++++++++++OPTIONS = ${options}"
 
@@ -54,17 +59,17 @@ vref=${PWD}/base
 install -d -m 755 ${vref}
 pl_mkfedora ${vref} ${options}
 
-for bootstrapfs in bootstrap-filesystems/*.lst ; do
-    NAME=$(basename $bootstrapfs .lst)
+for lst in ${pldistro}-filesystems/*.lst ; do
+    NAME=$(basename $lst .lst)
 
     echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 
     # "Parse" out the packages and groups for yum
-    packages=$(pl_getPackages $bootstrapfs)
-    groups=$(pl_getGroups $bootstrapfs)
+    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}/bootstrap-filesystems/${NAME}
+    vdir=${PWD}/${pldistro}-filesystems/${NAME}
     rm -rf ${vdir}/*
     install -d -m 755 ${vdir}
 
@@ -110,7 +115,7 @@ for bootstrapfs in bootstrap-filesystems/*.lst ; do
     mv ${vdir}-tmp ${vdir}
 
     echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
-    tar -cpjf bootstrap-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
+    tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
     echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
     echo "--------DONE BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
 done