the issue with ulogd seems to be related to mkfedora having lost its -k option somehow

[vserver-reference.git] / build.sh

diff --git a/build.sh b/build.sh
index 7992ebb..de0d5ff 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -53,17 +53,14 @@ 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="vserver-reference.lst"
+options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $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
     NAME=$(basename $systemvserver .lst)
@@ -71,8 +68,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}/*