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

diff --git a/build.sh b/build.sh
index 7992ebb..dad616b 100755
--- a/build.sh
+++ b/build.sh
@@ -37,6 +37,10 @@ pl_process_fedora_options $@
 shiftcount=$?
 shift $shiftcount
 
+# pldistro expected as $1 - defaults to planetlab
+pldistro=planetlab
+[ -n "$@" ] && pldistro=$1
+
 # Do not tolerate errors
 set -e
 
@@ -53,26 +57,23 @@ vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
 # "Parse" out the packages and groups for mkfedora
-options=""
-vrefpackages=$(pl_getPackages base.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
+lst="${pldistro}-vserver.lst"
+options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)"
 
 # Populate a minimal /dev in the reference image
 pl_makedevs ${vref}
 
 # Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options}
+pl_setup_chroot ${vref} ${options} -k
 
-for systemvserver in reference-vservers/*.lst ; do
+for systemvserver in ${pldistro}-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_getPackages2 ${pl_DISTRO_NAME} $systemvserver)
+    systemgroups=$(pl_getGroups2 ${pl_DISTRO_NAME} $systemvserver)
 
     vdir=${vstubdir}/${NAME}
     rm -rf ${vdir}/*