install -d -m 755 ${vref}
# "Parse" out the packages and groups for mkfedora
-options=""
-vrefpackages=$(pl_getPackages base.lst)
-for package in ${vrefpackages} ; do options="$options -p $package"; done
-vrefgroups=$(pl_getGroups base.lst)
-for group in ${vrefgroups} ; do options="$options -g $group"; done
+lst="vserver-reference.lst"
+options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
# Populate a minimal /dev in the reference image
pl_makedevs ${vref}
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
- systempackages=$(grep "^package:.*" $systemvserver | awk '{print $2}')
- systemgroups=$(grep "^group:.*" $systemvserver | awk '{print $2}')
+ systempackages=$(pl_getPackages $systemvserver)
+ systemgroups=$(pl_getGroups $systemvserver)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
echo ${vrefname} > ${vdir}.cloned
# Install the system vserver specific packages
- [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
+ # 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
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.