shiftcount=$?
shift $shiftcount
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
# Do not tolerate errors
set -e
# "Parse" out the packages and groups into the options passed to mkfedora
# -k = exclude kernel* packages
-options="-k"
-lst="base.lst"
-packages=$(pl_getPackages $lst)
-groups=$(pl_getGroups $lst)
-for package in ${packages} ; do options="$options -p $package"; done
-for group in ${groups} ; do options="$options -g $group"; done
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
-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_mkfedora ${vref} -k -f $pkgsfile
-for lst in bootstrap-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_getPackages $lst)
- groups=$(pl_getGroups $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}/bootstrap-filesystems/${NAME}
+ vdir=${PWD}/${pldistro}-filesystems/${NAME}
rm -rf ${vdir}/*
install -d -m 755 ${vdir}
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