X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=b426b16c978c081f78dedec24a26045e51661111;hb=2ef82c0d430621a1dd23e5e142728df9de7a8739;hp=fd6757c36d24d594cd9c3b70fbd10633fbb6a19c;hpb=5fb0ab332a04a567433433f9cf88f3bf4691a778;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index fd6757c..b426b16 100755
--- a/build.sh
+++ b/build.sh
@@ -56,24 +56,20 @@ vrefname=default
 vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
-# "Parse" out the packages and groups for mkfedora
-lst="${pldistro}-vserver.lst"
-options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions ${pl_DISTRO_NAME} $lst)"
-
-# Populate a minimal /dev in the reference image
-pl_makedevs ${vref}
+# locate the packages and groups file
+pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
 
 # Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options} -k
+pl_root_setup_chroot ${vref} -k -f $pkgsfile
 
-for systemvserver in ${pldistro}-vservers/*.lst ; do
-    NAME=$(basename $systemvserver .lst)
+for systemvserver in ../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=$(pl_getPackages2 ${pl_DISTRO_NAME} $systemvserver)
-    systemgroups=$(pl_getGroups2 ${pl_DISTRO_NAME} $systemvserver)
+    systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $systemvserver)
+    systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $systemvserver)
 
     vdir=${vstubdir}/${NAME}
     rm -rf ${vdir}/*