X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=dad616bb0d36b343537a318777d4c547683ee574;hb=b45c19601779a5b015506f70afa3ac0371cfaa0a;hp=cbb1f893b241a2bf28567582aac7f1abda33d41e;hpb=c3c0eca7181a781d347f8d0e2e0af17efee7f758;p=sliceimage.git diff --git a/build.sh b/build.sh index cbb1f89..dad616b 100755 --- a/build.sh +++ b/build.sh @@ -58,7 +58,7 @@ 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)" +options="$(pl_getPackagesOptions2 ${pl_DISTRO_NAME} $lst) $(pl_getGroupsOptions2 ${pl_DISTRO_NAME} $lst)" # Populate a minimal /dev in the reference image pl_makedevs ${vref} @@ -72,8 +72,8 @@ for systemvserver in ${pldistro}-vservers/*.lst ; do echo "--------START BUILDING system vserver ${NAME}: $(date)" # "Parse" out the packages and groups for yum - systempackages=$(pl_getPackages $systemvserver) - systemgroups=$(pl_getGroups $systemvserver) + systempackages=$(pl_getPackages2 ${pl_DISTRO_NAME} $systemvserver) + systemgroups=$(pl_getGroups2 ${pl_DISTRO_NAME} $systemvserver) vdir=${vstubdir}/${NAME} rm -rf ${vdir}/*