Allow /etc/init.d/010-containerd to exit when complete

Don't think there is a need for it to remain and it drops an unnecessary
process.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2017-06-14 16:21:08 +01:00
parent 5833d1b6bc
commit d51784adc0
40 changed files with 39 additions and 41 deletions

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
services:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS1 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -4,7 +4,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -39,5 +39,3 @@ then
service start "$(basename $f)"
done
fi
wait

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.4.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.11.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot:

View File

@ -4,7 +4,7 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- linuxkit/init:d04cb1ef203f3d3b320e2a7d0ded127d21cabd74
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
onboot: