Merge pull request #1823 from vcaputo/cease-journald-forward-to-console

coreos-overlay: cease ForwardToConsole in journald
This commit is contained in:
Alex Crawford 2016-04-05 13:28:11 -07:00
commit afcde888fb
3 changed files with 2 additions and 3 deletions

View File

@ -3,7 +3,7 @@
set oem_id="azure" set oem_id="azure"
# Azure only has a serial console. # Azure only has a serial console.
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 systemd.journald.forward_to_console=yes" set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200"
serial com0 --speed=115200 --word=8 --parity=no serial com0 --speed=115200 --word=8 --parity=no
terminal_input serial_com0 terminal_input serial_com0
terminal_output serial_com0 terminal_output serial_com0

View File

@ -4,4 +4,4 @@ set oem_id="ec2"
# Blacklist the Xen framebuffer module so it doesn't get loaded at boot # Blacklist the Xen framebuffer module so it doesn't get loaded at boot
# Disable `ens3` style names, so eth0 is used for both ixgbevf or xen. # Disable `ens3` style names, so eth0 is used for both ixgbevf or xen.
set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0 systemd.journald.forward_to_console=yes" set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0"

View File

@ -3,7 +3,6 @@
set oem_id="gce" set oem_id="gce"
# GCE only has a serial console. # GCE only has a serial console.
set linux_append="systemd.journald.forward_to_console=yes"
set linux_console="console=ttyS0,115200n8" set linux_console="console=ttyS0,115200n8"
serial com0 --speed=115200 --word=8 --parity=no serial com0 --speed=115200 --word=8 --parity=no
terminal_input serial_com0 terminal_input serial_com0