From a5b9464a4ef50ca5fb1a4e62ba756d8208da8c66 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 9 Jul 2017 17:37:52 +0100 Subject: [PATCH] Move ttyS0 after tty0 as it is more common This means more users will see console output at boot time. Remove page poison from example CLIs, we should document this elsewhere and put in blueprints. Signed-off-by: Justin Cormack --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- linuxkit.yml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 5761e4517..dc43cd975 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/azure.yml b/examples/azure.yml index c85efecff..8614ace06 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/docker.yml b/examples/docker.yml index 8efd7ef05..7bb8ace0b 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/gcp.yml b/examples/gcp.yml index 1d11038ad..2315c7347 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/getty.yml b/examples/getty.yml index 49b2d6b67..8ebf69727 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/minimal.yml b/examples/minimal.yml index 42342b802..d1a0df5b4 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 1c5236bc9..b24ea0585 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/packet.yml b/examples/packet.yml index 9d3aedd03..a4a52bfe0 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS1 page_poison=1" + cmdline: "console=ttyS1" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/redis-os.yml b/examples/redis-os.yml index a501ee07f..f049e29cf 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.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/sshd.yml b/examples/sshd.yml index 19f9b7499..9d7839b64 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/swap.yml b/examples/swap.yml index 439341723..919c5d2d5 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/vmware.yml b/examples/vmware.yml index 7616bdb2f..c0b7b7dbc 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=tty0 page_poison=1" + cmdline: "console=tty0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 66753d884..feb397461 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/vsudd.yml b/examples/vsudd.yml index b5b1d220b..1fd7b17f3 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/examples/vultr.yml b/examples/vultr.yml index 9995db5cd..cec25c1dc 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f diff --git a/linuxkit.yml b/linuxkit.yml index 0ed7cbd89..de7420205 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.36 - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:14a38303ee9dcb4541c00e2b87404befc1ba2083 - linuxkit/runc:2310ad9d266cf5d9c4d07613bd2135ed7eb8a21f