shiftcount=$?
shift $shiftcount
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
# Do not tolerate errors
set -e
# would like to pretend that we are.
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
-
-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_root_makedevs $vref
+
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
+# -k = exclude kernel* packages
+pl_root_mkfedora -k -f $pkgsfile ${vref}
-for bootstrapfs in bootstrap-filesystems/*.lst ; do
- NAME=$(basename $bootstrapfs .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 $bootstrapfs)
- groups=$(pl_getGroups $bootstrapfs)
- 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}
[ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups
if [ -f "${vdir}/proc/cpuinfo" ] ; then
- echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
- umount ${vdir}/proc
+ echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
+ umount ${vdir}/proc
fi
+ # Remove unneeded services
+ for service in util-vserver vprocunhide vservers-default; do
+ chroot ${vdir} /sbin/chkconfig $service off
+ done
+
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step
# process:
rm -rf ${vdir}
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
+
+ # Add site_admin account
+ chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
+
+ # Disable /etc/cron.*/000-delay.cron. Used to splay crons. PL crons
+ # already do this.
+ echo > ${vdir}/etc/sysconfig/crontab
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)"