shiftcount=$?
shift $shiftcount
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
# Do not tolerate errors
set -e
install -d -m 755 ${vref}
# "Parse" out the packages and groups for mkfedora
-options=""
-lst="vserver-reference.lst"
-vrefpackages=$(pl_getPackages $lst)
-vrefgroups=$(pl_getGroups $lst)
-for package in ${vrefpackages} ; do options="$options -p $package"; done
-for group in ${vrefgroups} ; do options="$options -g $group"; done
+lst="${pldistro}-vserver.lst"
+options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)"
# Populate a minimal /dev in the reference image
pl_makedevs ${vref}
# Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options}
+pl_setup_chroot ${vref} ${options} -k
-for systemvserver in reference-vservers/*.lst ; do
+for systemvserver in ${pldistro}-vservers/*.lst ; do
NAME=$(basename $systemvserver .lst)
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_getPackages2 ${pl_DISTRO_NAME} $systemvserver)
+ systemgroups=$(pl_getGroups2 ${pl_DISTRO_NAME} $systemvserver)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
echo ${vrefname} > ${vdir}.cloned
# Install the system vserver specific packages
- # xxx - thierry -adding disablerepo for closing the build loop - should be solved some other way
- [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} --disablerepo=extras -y install $systempackages
+ [ -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
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.