X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=e541600ad4749ba51c5a1ff21f38686ccddceb2f;hb=37b75749f401c405717c5f358fa3f5bb89222433;hp=85c1f82a73baaa894214093787338c19ef19caa3;hpb=c10dd89d76d280fc7ee09b4ba384acf6883c08cf;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 85c1f82a..e541600a 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -24,7 +24,7 @@ export PATH=$PATH:/bin:/sbin
 DEFAULT_FCDISTRO=f20
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
-DEFAULT_MEMORY=512
+DEFAULT_MEMORY=1024
 
 ##########
 # constant
@@ -165,10 +165,13 @@ function fedora_download() {
     MIRROR_URL=$FEDORA_MIRROR_BASE/releases/$release/Everything/$arch/os
     RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
     # with fedora18 the rpms are scattered by first name
-    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
+    # first try the second version of fedora-release first
+    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-2.noarch.rpm"
+    RELEASE_URL3="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
+   
     RELEASE_TARGET=$INSTALL_ROOT/fedora-release-$release.noarch.rpm
     found=""
-    for attempt in $RELEASE_URL1 $RELEASE_URL2; do
+    for attempt in $RELEASE_URL1 $RELEASE_URL2 $RELEASE_URL3; do
 	if curl -f $attempt -o $RELEASE_TARGET ; then
 	    echo "Retrieved $attempt"
 	    found=true
@@ -647,7 +650,10 @@ function post_install () {
 	if [ -n "$START_VM" ] ; then
 	    virsh -c lxc:/// start $lxc
 	    # manually run dhclient in guest - somehow this network won't start on its own
-            virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "dhclient $VIF_GUEST"
+	    # we need the --noseclabel flag with recent libvirt's
+	    # was not required with f20/libvirt-1.2.5
+	    # but is now with f21/libvirt-1.2.9
+            virsh -c lxc:/// lxc-enter-namespace --noseclabel $lxc /usr/bin/$personality /bin/bash -c "dhclient $VIF_GUEST"
 	fi
     else
 	post_install_myplc $lxc $personality