Merge pull request #1400 from rneugeba/init

Fix console handling

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"

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"

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"

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"

pkg/init/init

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

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"

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"

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"