From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 1 Apr 2015 15:10:22 +0000 (+0200)
Subject: f21
X-Git-Tag: 5.3.8~6
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=e202383a51dd6c11437285a8414f464dfe9eca4d

f21
---

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index e541600a..869bf760 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -21,7 +21,7 @@ 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=1024
@@ -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
+#      <network>
+#        <name>host-bridge</name>
+#        <forward mode="bridge"/>
+#        <bridge name="br0"/>
+#      </network>
+#
+
 function write_lxc_xml_test () {
     lxc=$1; shift
     cat <<EOF
@@ -509,11 +518,6 @@ function write_lxc_xml_test () {
     </interface>
     <console type='pty' />
   </devices>
-  <network>
-    <name>host-bridge</name>
-    <forward mode="bridge"/>
-    <bridge name="$PUBLIC_BRIDGE"/>
-  </network>
 </domain>
 EOF
 }