From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 26 Nov 2007 23:03:09 +0000 (+0000)
Subject: change configure_yum_in_vserver() to update the @...@ variables from yum.conf before... 
X-Git-Tag: 4.2-rc2~445
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec527d96bfa2585bbd80f49d62312df3359256e0;p=build.git

change configure_yum_in_vserver() to update the @...@ variables from yum.conf before putting it into the vserver
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 3cf33d69..fbea5d12 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -25,7 +25,13 @@ function configure_yum_in_vserver () {
     cd /etc/vservers/.distributions/${fcdistro}
     if [ -f yum/yum.conf ] ; then
 	echo "Initializing yum.conf in $vserver from $(pwd)/yum"
-	cp yum/yum.conf /vservers/$vserver/etc/yum.conf
+        sed -e "s!@YUMETCDIR@!/etc!g;
+                s!@YUMCACHEDIR@!/var/cache/yum!g;
+                s!@YUMLOGDIR@!/var/log!g;
+                s!@YUMLOCKDIR@!/var/lock!g;
+               " yum/yum.conf > /vservers/$vserver/etc/yum.conf
+
+	# post process the various @...@ variables from this yum.conf file.
     else
 	echo "Cannot initialize yum.conf in $vserver - using $fcdistro default"
     fi