X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=869bf76093a2cc9641dcce8157971a29475e1883;hb=d6f9fd163b2e16c123174389b62e9816d2a8109a;hp=e9c13e6af904ff45565c663772a3523303c6e911;hpb=015e930f2db1101985e6c3c3ccf03473df33dcf1;p=build.git
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index e9c13e6a..869bf760 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -21,10 +21,10 @@ export PATH=$PATH:/bin:/sbin
# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
-DEFAULT_FCDISTRO=f20
+DEFAULT_FCDISTRO=f21
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
-DEFAULT_MEMORY=512
+DEFAULT_MEMORY=1024
##########
# constant
@@ -165,9 +165,9 @@ 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"
- # with fedora21 somehow this one came numbered -2
+ # 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=""
@@ -479,6 +479,15 @@ function setup_lxc() {
return 0
}
+# this part does not belong in a domain any more
+# but goes in a network object of its own existence
+#
+# host-bridge
+#
+#
+#
+#
+
function write_lxc_xml_test () {
lxc=$1; shift
cat <
-
- host-bridge
-
-
-
EOF
}
@@ -650,7 +654,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