X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=1916aaa9be20992f689bf8bee7909b5413f64217;hb=f12b85a62d92e08f68cf031ccd834eb350ab9c61;hp=63ede95620193eef3e0135a76cdee5c481f02588;hpb=89db78cb2680d360c75a845fd29026836f9b49b9;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index 63ede95..1916aaa 100755
--- a/build.sh
+++ b/build.sh
@@ -53,11 +53,8 @@ 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
+lst="vserver-reference.lst"
+options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
 
 # Populate a minimal /dev in the reference image
 pl_makedevs ${vref}
@@ -71,16 +68,14 @@ for systemvserver in reference-vservers/*.lst ; do
     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*
 
@@ -88,7 +83,11 @@ for systemvserver in reference-vservers/*.lst ; do
     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.