From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 8 Nov 2007 22:30:19 +0000 (+0000)
Subject: switch to using pl_get{Packages,Groups}
X-Git-Tag: vserver-4.2-0~14
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=e389da01a607e289ead525acb89f59e82d1cd5d2

switch to using pl_get{Packages,Groups}
---

diff --git a/build.sh b/build.sh
index 7992ebb..bbef6ee 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}/*