From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 18 Nov 2007 21:48:08 +0000 (+0000)
Subject: the issue with ulogd seems to be related to mkfedora having lost its -k option somehow
X-Git-Tag: vserver-4.2-0~11
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=d932bb545864493f5685319ec77b3d2d02e2ac6e

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

diff --git a/build.sh b/build.sh
index 1916aaa..de0d5ff 100755
--- a/build.sh
+++ b/build.sh
@@ -60,7 +60,7 @@ options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
 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)
@@ -83,11 +83,7 @@ for systemvserver in reference-vservers/*.lst ; do
     echo ${vrefname} > ${vdir}.cloned
 
     # Install the system vserver specific packages
-    # xxx - thierry -adding disablerepo for closing the build loop - should be solved some other way
-    if [ "$pl_DISTRO_RELEASE" -le 6 ] ; then
-	xxx=--disablerepo=extras
-    fi
-    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} $xxx -y install $systempackages
+    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
     [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
 
     # Create a copy of the system vserver w/o the vserver reference files and make it smaller.