shiftcount=$?
shift $shiftcount
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
# Do not tolerate errors
set -e
vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
-# "Parse" out the packages and groups for mkfedora
-vrefpackages=$(grep "^package:.*" vserver-reference.lst | awk '{print $2}')
-vrefgroups=$(grep "^group:.*" vserver-reference.lst | awk '{print $2}')
-options=""
-for package in ${vrefpackages} ; do options="$options -p $package"; done
-for group in ${vrefgroups} ; do options="$options -g $group"; done
+# locate the packages and groups file
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
-# 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_setup_chroot ${vref} -k -f $pkgsfile
-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=$(grep "^package:.*" $systemvserver | awk '{print $2}')
- systemgroups=$(grep "^group:.*" $systemvserver | awk '{print $2}')
+ systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $systemvserver)
+ systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $systemvserver)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
install -d -m 755 ${vdir}
# Clone the base vserver reference to the system vserver reference
-
- # OPTIMIZATION: Consider using "cp -al" in the future
(cd ${vref} && find . | cpio -m -d -u -p ${vdir})
rm -f ${vdir}/var/lib/rpm/__db*
# 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: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes
+ # step 1: clean out yum cache to reduce space requirements
+ yum -c ${vdir}/etc/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
linecount=$(wc -l ${vdir}.changes | awk ' { print $1 } ')
let headcount=$linecount-3
awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
rm -f ${vdir}.changes.*
- # step 2: clean out yum cache to reduce space requirements
- yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
-
# step 3: create the ${vdir} with just the list given in ${vdir}.changes
install -d -m 755 ${vdir}-tmp/
rm -rf ${vdir}-tmp/*