shiftcount=$?
shift $shiftcount
+# pldistro expected as $1
+pldistro=$1 ; shift
+# The vserver reference name - this comes from spec's slicefamily
+slicefamily=$1; shift
+
# Do not tolerate errors
set -e
# Path's to the vserver references images and stubs
vrefdir=$PWD/vservers/.vref
-vstubdir=$PWD/vservers/.vstub
-
-# XXX: The vserver reference name should be passed in as an argument
-# rather than being hardcoded.
-vrefname=default
+vref=${vrefdir}/${slicefamily}
+# stubs are created in a subdir per slicefamily
+vstubdir=$PWD/vservers/.vstub/${slicefamily}
# Make /vservers and default vserver reference image
-vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
+# needed for pldistros that don't have any system vserver images
+install -d -m 755 ${vstubdir}
-# "Parse" out the packages and groups for mkfedora
-lst="vserver-reference.lst"
-options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
-
-# Populate a minimal /dev in the reference image
-pl_makedevs ${vref}
+# Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
+# unless the installation is running inside the BootCD environment. We
+# would like to pretend that we are.
+export PL_BOOTCD=1
# Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options}
+pl_root_makedevs ${vref}
+# locate the packages and groups file
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
+pl_root_mkfedora ${vref} ${pldistro} $pkgsfile
+pl_root_tune_image ${vref}
-for systemvserver in reference-vservers/*.lst ; do
- NAME=$(basename $systemvserver .lst)
+systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null | wc -l)
+[ $systemvserver_count -gt 0 ] && for systemvserver in $(ls ../build/config.${pldistro}/vserver-*.pkgs) ; do
+ NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,)
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
- systempackages=$(pl_getPackages $systemvserver)
- systemgroups=$(pl_getGroups $systemvserver)
+ systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $pldistro $systemvserver)
+ systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $pldistro $systemvserver)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
rm -f ${vdir}/var/lib/rpm/__db*
# Communicate to the initialization script from which vref this stub was cloned
- echo ${vrefname} > ${vdir}.cloned
+ echo ${slicefamily} > ${vdir}.cloned
# Install the system vserver specific packages
- # xxx - thierry -adding disablerepo for closing the build loop - should be solved some other way
- if [ "$pl_DISTRO_RELEASE" -le 6 ] ; then
- xxx=--disablerepo=extras
- fi
- [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} $xxx -y install $systempackages
- [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+ [ -n "$systempackages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $systempackages
+ for group_plus in $systemgroups; do
+ group=$(echo $group_plus | sed -e "s,+++, ,g")
+ yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group"
+ done
+
+ pkgsdir=$(dirname $pkgsfile)
+ pkgsname=$(basename $pkgsfile .pkgs)
+ postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${pkgsname}.post")
+ [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
# Create a copy of the system vserver w/o the vserver reference files 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
+ yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y clean all
# step 2: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes
rsync -anv ${vdir}/ ${vref}/ > ${vdir}.changes
echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
done
+pkgsdir=$(dirname $pkgsfile)
+pkgsname=$(basename $pkgsfile .pkgs)
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} "${pkgsname}.post")
+[ -f $postfile ] && /bin/bash $postfile ${vref} || :
+
+# fix sudoers config
+[ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers
+
exit 0