- creates a vbuild with an IP address assigned - from vs2.3 this is mandatory for...

[build.git] / vbuild-init-vserver.sh

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 17219d1..0b487f1 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -129,7 +129,12 @@ function setup_vserver () {
     fi
 
     $personality vyum $vserver -- -y install yum
-    $personality vserver $VERBOSE $vserver pkgmgmt internalize
+    # ditto
+    for i in 1 2 3 4 5 ; do
+       $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true
+       echo "Waiting for one minute"
+       sleep 60
+    done
 
     # start the vserver so we can do the following operations
     $personality vserver $VERBOSE $vserver start
@@ -141,9 +146,11 @@ function setup_vserver () {
 
     # set up resolv.conf
     cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf
+    # and /etc/hosts for at least localhost
+    [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts
 }
 
-function devel_tools () {
+function devel_or_vtest_tools () {
 
     set -x 
     set -e 
@@ -163,8 +170,8 @@ function devel_tools () {
     pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
 
     # install individual packages, then groups
-    packages=$(pl_getPackages ${fcdistro} $pkgsfile)
-    groups=$(pl_getGroups ${fcdistro} $pkgsfile)
+    packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile)
+    groups=$(pl_getGroups $fcdistro $pldistro $pkgsfile)
 
     [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
     [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
@@ -333,7 +340,7 @@ function main () {
     [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY
 
     setup_vserver $vserver $fcdistro $personality 
-    devel_tools $vserver $fcdistro $pldistro $personality
+    devel_or_vtest_tools $vserver $fcdistro $pldistro $personality
     post_install $vserver $personality
 
 }