diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-01 21:00:26 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-01 21:00:26 +0200 |
| commit | 3afc7623dd8bd8a3af7539f0a3eb8f0405dd002c (patch) | |
| tree | ae92ad349da7470b02efad27422d8d5ebd3c863a | |
| parent | d2a0d2ceabac76ed3069bf265335b3e857093959 (diff) | |
| download | nova-3afc7623dd8bd8a3af7539f0a3eb8f0405dd002c.tar.gz nova-3afc7623dd8bd8a3af7539f0a3eb8f0405dd002c.tar.xz nova-3afc7623dd8bd8a3af7539f0a3eb8f0405dd002c.zip | |
Revert the changes to the qemu libvirt template and make the appropriate changes in the UML template where they belong.
| -rw-r--r-- | nova/virt/libvirt.qemu.xml.template | 7 | ||||
| -rw-r--r-- | nova/virt/libvirt.uml.xml.template | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template index 6cba84f3f..307f9d03a 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</cmdline> + <cmdline>root=/dev/vda1 console=ttyS0</cmdline> </os> <features> <acpi/> @@ -21,9 +21,10 @@ <mac address='%(mac_address)s'/> <!-- <model type='virtio'/> CANT RUN virtio network right now --> </interface> - <console type="file"> + <serial type="file"> <source path='%(basepath)s/console.log'/> - </console> + <target port='1'/> + </serial> </devices> <nova>%(nova)s</nova> </domain> diff --git a/nova/virt/libvirt.uml.xml.template b/nova/virt/libvirt.uml.xml.template index 6f4290f98..a72a6b8c3 100644 --- a/nova/virt/libvirt.uml.xml.template +++ b/nova/virt/libvirt.uml.xml.template @@ -15,11 +15,9 @@ <source bridge='%(bridge_name)s'/> <mac address='%(mac_address)s'/> </interface> - <console type="pty" /> - <serial type="file"> + <console type="file"> <source path='%(basepath)s/console.log'/> - <target port='1'/> - </serial> + </console> </devices> <nova>%(nova)s</nova> </domain> |