From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 20 Mar 2008 09:28:32 +0000 (+0000)
Subject: cosmetic
X-Git-Tag: 4.2-rc2~133
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a62ce5250dd05634bc3725a58a498624dd118956;p=build.git

cosmetic
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 7bfb6444..90a3f41d 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -27,7 +27,7 @@ function configure_yum_in_vserver () {
     vserver=$1; shift
     fcdistro=$1; shift
 
-    cd /etc/vservers/.distributions/${fcdistro}
+    pushd /etc/vservers/.distributions/${fcdistro}
     if [ -f yum/yum.conf ] ; then
 	echo "Initializing yum.conf in $vserver from $(pwd)/yum"
         sed -e "s!@YUMETCDIR@!/etc!g;
@@ -67,7 +67,7 @@ gpgcheck=0
 EOF
 	fi
     fi
-    cd -
+    popd
 }    
 
 function setup_vserver () {
@@ -158,8 +158,10 @@ function setup_vserver () {
 	else
 	    echo "You seem to be running vs2.3 with util-vserver < 0.30.215"
 	    echo "This combination is not supported by $COMMAND"
-	    echo "Please upgrade our environment"
+	    echo "Please upgrade your environment"
 	    exit 1
+# this supposedly is an equivalent to using vdevmap as invoked above
+# but it's not going to work in this case
 #	    mkdir -p /etc/vservers/$vserver/apps/vdevmap/default-{block,char}
 #	    touch /etc/vservers/$vserver/apps/vdevmap/default-{block,char}/{open,create}
 #	    echo /dev/root > /etc/vservers/$vserver/apps/vdevmap/default-block/target