shiftcount=$?
shift $shiftcount
-# pldistro expected as $1 - defaults to planetlab
+# 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}
# Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
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
[ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
# switch the vserver reference /etc/yum.conf to the new one from the yum package
[ -f ${vref}/etc/yum.conf.rpmnew ] && mv -f ${vref}/etc/yum.conf.rpmnew ${vref}/etc/yum.conf
+# fix sudoers config
+[ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers
+
exit 0