summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorSoren Hansen <soren.hansen@rackspace.com>2010-08-26 15:20:01 +0200
committerSoren Hansen <soren.hansen@rackspace.com>2010-08-26 15:20:01 +0200
commitd3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8 (patch)
tree8ff069aca476e39d7e29c506f367cd25a1b73767 /nova
parent75eaa1b8f871753b9bd61c2ccd93efd813d651f9 (diff)
downloadnova-d3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8.tar.gz
nova-d3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8.tar.xz
nova-d3b8fea0d9d1a4ab8a8a2f2dc7daea1c512b1ea8.zip
Set UML guests to use a file as their console. This halfway fixes get-console-output for them.
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/libvirt.qemu.xml.template7
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template
index 307f9d03a..6cba84f3f 100644
--- a/nova/virt/libvirt.qemu.xml.template
+++ b/nova/virt/libvirt.qemu.xml.template
@@ -4,7 +4,7 @@
<type>hvm</type>
<kernel>%(basepath)s/kernel</kernel>
<initrd>%(basepath)s/ramdisk</initrd>
- <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
+ <cmdline>root=/dev/vda1</cmdline>
</os>
<features>
<acpi/>
@@ -21,10 +21,9 @@
<mac address='%(mac_address)s'/>
<!-- <model type='virtio'/> CANT RUN virtio network right now -->
</interface>
- <serial type="file">
+ <console type="file">
<source path='%(basepath)s/console.log'/>
- <target port='1'/>
- </serial>
+ </console>
</devices>
<nova>%(nova)s</nova>
</domain>