From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 24 May 2013 10:06:03 +0000 (+0200)
Subject: try to address an oddity with ubuntu/raring
X-Git-Tag: 5.2.3~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7454b2a56f56381f3ce0019ff6a6ed83c1d041f6;p=build.git

try to address an oddity with ubuntu/raring
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 11e30903..bff3cb84 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -244,9 +244,11 @@ function setup_vserver () {
 #    fi
 
     # start the vserver so we can do the following operations
-    # redirect out/err to protect against the vserver's init sequence getting stalled 
-    # mostly used for f10 vservers created remotely through ssh
-    $personality vserver $VERBOSE $vserver start >& /dev/null
+    # with ubuntu/raring, somehow the vserver is already running at this point
+    $personality vserver $vserver status >& /dev/null || \
+      # redirect out/err to protect against the vserver's init sequence getting stalled 
+      # mostly used for f10 vservers created remotely through ssh
+      $personality vserver $VERBOSE $vserver start >& /dev/null
 
     if [ "$pkg_method" == "yum" ] ; then
 	$personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"