From 02146dcfc5664c0c674e4fcbb2162c428fe2d6dc Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 28 Mar 2017 10:53:44 +0100 Subject: [PATCH] init: update yaml files with new init image Also add tty0 as a console to default moby image Signed-off-by: Rolf Neugebauer --- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 4 ++-- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/gcp.yml b/examples/gcp.yml index fcf654e93..5388bd0ef 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/sshd.yml b/examples/sshd.yml index c48fa3065..3ffcba5b6 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/vmware.yml b/examples/vmware.yml index be3ae5a3a..ec55b9cc4 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" -init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/moby.yml b/moby.yml index eb1cc003b..890409b82 100644 --- a/moby.yml +++ b/moby.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" - cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" + cmdline: "console=ttyS0 console=tty0 page_poison=1" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 14ff8e2b0..90357b49c 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: ltp image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870" diff --git a/test/test.yml b/test/test.yml index 69b5418e4..7d6ce45fd 100644 --- a/test/test.yml +++ b/test/test.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index bbef8d7b8..1b52c3c89 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -5,7 +5,7 @@ kernel: # image: "mobylinux/kernel:4.9.14-0" image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" +init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"