X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=c7ba063b76ef68071070e89358adf6b8b937f9d3;hb=1078ba9a452f0c3f22a21857881e772bdcdf7ebb;hp=7992ebb82124cc0197f56d970c36ca30e3accfdc;hpb=51cc7bf0c7e5709d83d6eb5b4cae6be3b0f8f01a;p=sliceimage.git

diff --git a/build.sh b/build.sh
index 7992ebb..c7ba063 100755
--- a/build.sh
+++ b/build.sh
@@ -54,9 +54,10 @@ install -d -m 755 ${vref}
 
 # "Parse" out the packages and groups for mkfedora
 options=""
-vrefpackages=$(pl_getPackages base.lst)
+lst="vserver-reference.lst"
+vrefpackages=$(pl_getPackages $lst)
+vrefgroups=$(pl_getGroups $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
 
 # Populate a minimal /dev in the reference image
@@ -71,8 +72,8 @@ 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}/*
@@ -86,7 +87,8 @@ 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
+    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} --disablerepo=extras -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.