Merge ~rafaelfolco/cirros:ppc_console into cirros:master

Proposed by Rafael Folco on 2017-07-07
Status: Needs review
Proposed branch: ~rafaelfolco/cirros:ppc_console
Merge into: cirros:master
Diff against target: 13 lines (+1/-1)
1 file modified
bin/part2disk (+1/-1)
Reviewer Review Type Date Requested Status
Robin H. Johnson (community) Approve on 2017-11-14
Scott Moser 2017-07-07 Pending
Review via email: mp+327016@code.launchpad.net

Description of the change

Enable console during kernel boot on Power

On Power systems console should be added the kernel command line
in the following order: 'console=tty0 console=hvc0'.
The first one is the graphical console. The last one is the serial
console. The kernel enables all the consoles pointed through the
kernel command line. However, only the last one will receive
input/output during kernel boot. All the other consoles will be
enabled after the boot.

This is required for QCOW2 images now used by default in DevStack.

To post a comment you must log in.
Robin H. Johnson (robbat2) wrote :

+1 on this change, but note that which console is chosen in QEMU without this patch depends on availability of VGA & USB input.

review: Approve

Unmerged commits

8ccdc1c... by Rafael Folco on 2017-07-07

Enable console during kernel boot on Power

On Power systems console should be added the kernel command line
in the following order: 'console=tty0 console=hvc0'.
The first one is the graphical console. The last one is the serial
console. The kernel enables all the consoles pointed through the
kernel command line. However, only the last one will receive
input/output during kernel boot. All the other consoles will be
enabled after the boot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bin/part2disk b/bin/part2disk
index e2dae8c..4a1d543 100755
--- a/bin/part2disk
+++ b/bin/part2disk
@@ -264,7 +264,7 @@ menuentry 'CirrOS' {
264 search --no-floppy --label --set=root cirros-rootfs264 search --no-floppy --label --set=root cirros-rootfs
265 fi265 fi
266266
267 linux /boot/${kernelfile} LABEL=cirros-rootfs ro267 linux /boot/${kernelfile} LABEL=cirros-rootfs ro console=tty0 console=hvc0
268 initrd /boot/${initrdfile}268 initrd /boot/${initrdfile}
269}269}
270EOF270EOF

Subscribers

People subscribed via source and target branches