From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 7 Nov 2008 12:59:03 +0000 (+0000)
Subject: for when /etc/vservers/.distribution/<distro> does not exist yet
X-Git-Tag: 4.3-rc1~135
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec940db17392e4fa674623f594c595509b40d65a;p=build.git

for when /etc/vservers/.distribution/<distro> does not exist yet
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 5e3acd5a..07657e39 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -32,24 +32,24 @@ function configure_yum_in_vserver () {
     vserver=$1; shift
     fcdistro=$1; shift
 
-    pushd /etc/vservers/.distributions/${fcdistro}
-    if [ -f yum/yum.conf ] ; then
-	echo "Initializing yum.conf in $vserver from $(pwd)/yum"
+    templates=/etc/vservers/.distributions/${fcdistro}
+    if [ -f ${templates}/yum/yum.conf ] ; then
+	echo "Initializing yum.conf in $vserver from ${templates}/yum"
         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
+               " ${templates}/yum/yum.conf > /vservers/$vserver/etc/yum.conf
 
 	# post process the various @...@ variables from this yum.conf file.
     else
 	echo "Using $fcdistro default for yum.conf"
     fi
 
-    if [ -d yum.repos.d ] ; then
-	echo "Initializing yum.repos.d in $vserver from $(pwd)/yum.repos.d"
+    if [ -d ${templates}/yum.repos.d ] ; then
+	echo "Initializing yum.repos.d in $vserver from ${templates}/yum.repos.d"
 	rm -rf /vservers/$vserver/etc/yum.repos.d
-	tar cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf -
+	tar -C ${templates} -cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf -
     else
 	echo "Cannot initialize yum.repos.d in $vserver"
     fi
@@ -72,7 +72,6 @@ gpgcheck=0
 EOF
 	fi
     fi
-    popd
 }    
 
 # return yum or debootstrap