vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
-# "Parse" out the packages and groups for mkfedora
+# 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} -k -f $pkgsfile
+pl_root_setup_chroot ${vref} -k -f $pkgsfile
-for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
+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)"
[ -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
+ pkgsdir=$(dirname $pkgsfile)
+ pkgsname=$(basename $pkgsfile .pkgs)
+ postfile="${pkgsdir}/${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
+ [ -f ${vdir}/etc/yum.conf.rpmnew ] && mv -f ${vdir}/etc/yum.conf.rpmnew ${vdir}/etc/yum.conf
+
# 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 } ')
echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
done
+pkgsdir=$(dirname $pkgsfile)
+pkgsname=$(basename $pkgsfile .pkgs)
+postfile="${pkgsdir}/${pkgsname}.post"
+[ -f $postfile ] && /bin/bash $postfile ${vref} || :
+
+# 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
+
exit 0