git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
module-tools & git clone : specify --depth only when necessary
[build.git]
/
lbuild-initvm.sh
diff --git
a/lbuild-initvm.sh
b/lbuild-initvm.sh
index
e541600
..
869bf76
100755
(executable)
--- 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
# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
-DEFAULT_FCDISTRO=f2
0
+DEFAULT_FCDISTRO=f2
1
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MEMORY=1024
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
DEFAULT_MEMORY=1024
@@
-479,6
+479,15
@@
function setup_lxc() {
return 0
}
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
function write_lxc_xml_test () {
lxc=$1; shift
cat <<EOF
@@
-509,11
+518,6
@@
function write_lxc_xml_test () {
</interface>
<console type='pty' />
</devices>
</interface>
<console type='pty' />
</devices>
- <network>
- <name>host-bridge</name>
- <forward mode="bridge"/>
- <bridge name="$PUBLIC_BRIDGE"/>
- </network>
</domain>
EOF
}
</domain>
EOF
}