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
+lst="vserver-reference.lst"
+options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
# Populate a minimal /dev in the reference image
pl_makedevs ${vref}
for systemvserver in reference-vservers/*.lst ; do
NAME=$(basename $systemvserver .lst)
+ 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}/*
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*
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. This is a two step process:
+ # 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
- # step 1: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes
+ # 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
let tailcount=$headcount-1
+ # get rid of the last 3 lines of the rsync output
head -${headcount} ${vdir}.changes > ${vdir}.changes.1
- tail -${tailcount} ${vdir}.changes.1 > ${vdir}.changes
- rm -f ${vdir}.changes.1
+ # get rid of the first line of the rsync output
+ tail -${tailcount} ${vdir}.changes.1 > ${vdir}.changes.2
+ # post process rsync output to get rid of symbolic link embellish output
+ awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
+ rm -f ${vdir}.changes.*
- # step 2: create the ${vdir} with just the list given in ${vdir}.changes
+ # step 3: create the ${vdir} with just the list given in ${vdir}.changes
install -d -m 755 ${vdir}-tmp/
rm -rf ${vdir}-tmp/*
- (cd ${vdir} && cpio -l -m -d -u -p ${vdir}-tmp < ${vdir}.changes)
+ (cd ${vdir} && cpio -m -d -u -p ${vdir}-tmp < ${vdir}.changes)
rm -rf ${vdir}
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
+ echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
done
exit 0