From d96cb710c2653d37e1b3d3332179de850f60e2e4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 4 Aug 2017 15:48:45 +0100 Subject: [PATCH] Add console=ttyAMA0 to selected YAML files On arm64 the serial console is a ttyAMA0. Non-existing consoles are ignored, so this should work on x86 and arm64. Signed-off-by: Rolf Neugebauer --- examples/docker.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- linuxkit.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index ddbd3b1db..ea8e48dbc 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/examples/getty.yml b/examples/getty.yml index f407e412c..10d94feb9 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/examples/minimal.yml b/examples/minimal.yml index ecad47b9c..cb8dbeaff 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index c30cf772f..84dcb7708 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -2,7 +2,7 @@ # connect: nc localhost 6379 kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/examples/sshd.yml b/examples/sshd.yml index c8ebef263..4a88935ba 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/examples/swap.yml b/examples/swap.yml index 795ebc16b..3e0dca367 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541 diff --git a/linuxkit.yml b/linuxkit.yml index 1f691fbad..1dcb1cef6 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.40 - cmdline: "console=tty0 console=ttyS0" + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:906e174b3f2e07f97d6fd693a2e8518e98dafa58 - linuxkit/runc:90e45f13e1d0a0983f36ef854621e3eac91cf541