diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-29 16:21:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-29 16:21:32 +0000 |
| commit | 5a79532479e1c64eea77f70db0df81099e20480f (patch) | |
| tree | f99c4292f5f069042b77ac4f8261681216aeda55 | |
| parent | 500d662f955066c50f630dc21a8fd38506ae5dc6 (diff) | |
| parent | b980de7cd1ac0e9085c20392bf82d1d3b12b24e8 (diff) | |
Merge "Fix missing kernel output via VNC/Spice on boot"
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6dcca6054..dc0af8539 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2136,6 +2136,8 @@ class LibvirtDriver(driver.ComputeDriver): inst_path = libvirt_utils.get_instance_path(instance) disk_mapping = disk_info['mapping'] + CONSOLE = "console=tty0 console=ttyS0" + guest = vconfig.LibvirtConfigGuest() guest.virt_type = CONF.libvirt_type guest.name = instance['name'] @@ -2188,7 +2190,7 @@ class LibvirtDriver(driver.ComputeDriver): if CONF.libvirt_type == "lxc": guest.os_type = vm_mode.EXE guest.os_init_path = "/sbin/init" - guest.os_cmdline = "console=ttyS0" + guest.os_cmdline = CONSOLE elif CONF.libvirt_type == "uml": guest.os_type = vm_mode.UML guest.os_kernel = "/usr/bin/linux" @@ -2205,8 +2207,8 @@ class LibvirtDriver(driver.ComputeDriver): if CONF.libvirt_type == "xen": guest.os_cmdline = "ro" else: - guest.os_cmdline = ("root=%s console=ttyS0" % - root_device_name) + guest.os_cmdline = ("root=%s %s" % (root_device_name, + CONSOLE)) if rescue.get('ramdisk_id'): guest.os_initrd = os.path.join(inst_path, "ramdisk.rescue") @@ -2215,8 +2217,8 @@ class LibvirtDriver(driver.ComputeDriver): if CONF.libvirt_type == "xen": guest.os_cmdline = "ro" else: - guest.os_cmdline = ("root=%s console=ttyS0" % - root_device_name) + guest.os_cmdline = ("root=%s %s" % (root_device_name, + CONSOLE)) if instance['ramdisk_id']: guest.os_initrd = os.path.join(inst_path, "ramdisk") else: |