github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1400 from rneugeba/init

Browse Source 
Fix console handling
This commit is contained in:
Rolf Neugebauer 2017-03-28 14:44:58 +01:00 committed by GitHub
commit a5cbb4d592
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gcp.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
examples/sshd.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

2
examples/vmware.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1" cmdline: "console=tty0 page_poison=1"
init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

4
moby.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

7
pkg/init/init
View File

@ -14,9 +14,10 @@ setup_console() {
line="-L" line="-L"
term="vt100" term="vt100"
;; ;;
tty0) tty?)
# skip current console line=""
return 0 speed="38400"
term=""
;; ;;
esac esac
# skip consoles already in inittab # skip consoles already in inittab

2
test/ltp/test-ltp.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: "mobylinux/init:1402058c0f90adf2b12fcfb8332b334c7e9c5d8c" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: ltp - name: ltp
image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870" image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870"

2
test/test.yml
View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: "mobylinux/init:a5d75555065bd0b4d41777dda00e5154ae0785e6" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: binfmt - name: binfmt
image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"

2
test/virtsock/test-virtsock-server.yml
View File

@ -5,7 +5,7 @@ kernel:
# image: "mobylinux/kernel:4.9.14-0" # image: "mobylinux/kernel:4.9.14-0"
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: "mobylinux/init:d6d115d601e78f7909d4a2ff7eb4caa3fff65271" init: "mobylinux/init:83b229223adbdd5ae38f39b4754e61b951529664"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"