From 2b54e18f9f746fe3afb952bce26f84d93f537958 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 5 Apr 2017 16:39:14 +0100 Subject: [PATCH] Drop unnecessary use of start-stop-daemon with containerd. Signed-off-by: Ian Campbell --- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 2 +- pkg/init/etc/init.d/containerd | 2 +- projects/swarmd/swarmd.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/gcp.yml b/examples/gcp.yml index 2a6c30beb..155e90171 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/sshd.yml b/examples/sshd.yml index de0ceece9..e05009b09 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/vmware.yml b/examples/vmware.yml index fb9d90731..bc500367e 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/moby.yml b/moby.yml index 3d4080a72..1b74c172a 100644 --- a/moby.yml +++ b/moby.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/pkg/init/etc/init.d/containerd b/pkg/init/etc/init.d/containerd index 22c999ce6..f62710d7e 100755 --- a/pkg/init/etc/init.d/containerd +++ b/pkg/init/etc/init.d/containerd @@ -6,4 +6,4 @@ ulimit -p unlimited printf "\nStarting containerd\n" mkdir -p /var/log -exec /sbin/start-stop-daemon --start --exec /usr/bin/containerd +exec /usr/bin/containerd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8274a3230..1ae8e4140 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index a34adb4df..d0b2c100d 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: ltp image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870" diff --git a/test/test.yml b/test/test.yml index a7aa38caf..bc465465c 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 60d8d9974..c4a4409ea 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:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"