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"
-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}"
# 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}
-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}
rm -f ${vdir}/var/lib/rpm/__db*
# Install the system vserver specific packages
- [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
- [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+ [ -n "$packages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $packages
+ [ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups
- # Create a copy of the system vserver w/o the vserver reference files and make it smaller.
- # This is a three step process:
+ if [ -f "${vdir}/proc/cpuinfo" ] ; then
+ echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
+ umount ${vdir}/proc
+ fi
+
+ # Create a copy of the ${NAME} bootstrap filesystem w/o the base
+ # bootstrap filesystem and make it smaller. This is a three step
+ # process:
# step 1: clean out yum cache to reduce space requirements
yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
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
# Build the base Bootstrap filesystem
-echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
+echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"