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 b103734..de0d5ff 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -53,32 +53,29 @@ vref=${vrefdir}/${vrefname}
 install -d -m 755 ${vref}
 
 # "Parse" out the packages and groups for mkfedora
-vrefpackages=$(grep "^package:.*" vserver-reference.lst | awk '{print $2}')
-vrefgroups=$(grep "^group:.*" vserver-reference.lst | awk '{print $2}')
-options=""
-for package in ${vrefpackages} ; do  options="$options -p $package"; done
-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)
 
+    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}/*
     install -d -m 755 ${vdir}
 
     # Clone the base vserver reference to the system vserver reference
-
-       # OPTIMIZATION: Consider using "cp -al" in the future
     (cd ${vref} && find . | cpio -m -d -u -p ${vdir})
     rm -f ${vdir}/var/lib/rpm/__db*
 
@@ -100,9 +97,13 @@ for systemvserver in reference-vservers/*.lst ; do
     linecount=$(wc -l ${vdir}.changes | awk ' { print $1 } ')
     let headcount=$linecount-3
     let tailcount=$headcount-1
+    # get rid of the last 3 lines of the rsync output
     head -${headcount} ${vdir}.changes > ${vdir}.changes.1
-    tail -${tailcount} ${vdir}.changes.1 > ${vdir}.changes
-    rm -f ${vdir}.changes.1
+    # get rid of the first line of the rsync output
+    tail -${tailcount} ${vdir}.changes.1 > ${vdir}.changes.2
+    # post process rsync output to get rid of symbolic link embellish output
+    awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
+    rm -f ${vdir}.changes.*
 
     # step 3: create the ${vdir} with just the list given in ${vdir}.changes 
     install -d -m 755 ${vdir}-tmp/
@@ -111,7 +112,7 @@ for systemvserver in reference-vservers/*.lst ; do
     rm -rf ${vdir}
     rm -f  ${vdir}.changes
     mv ${vdir}-tmp ${vdir}
-
+    echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
 done
 
 exit 0