[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

[Sven Wegener]

commit:     b7ef9be685391ff5c82c990263036fc3776165a4
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 08:36:25 2019 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 08:43:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ef9be6

app-emulation/containerd: Write pidfile and create log directory

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 app-emulation/containerd/files/containerd.initd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd
index 3a02d494ad1..f0f4e735b5a 100644
--- a/app-emulation/containerd/files/containerd.initd
+++ b/app-emulation/containerd/files/containerd.initd
@@ -1,13 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Containerd container runtime"
 command="/usr/bin/containerd"
 pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
-start_stop_daemon_args="--background --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+start_stop_daemon_args="--background --make-pidfile --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
 start_pre() {
+	checkpath -m 0750 -d /var/log/${RC_SVCNAME}
+
 	ulimit -n 1048576
 
 	# Having non-zero limits causes performance problems due to accounting overhead

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/files/

[Sven Wegener]

commit:     0df5299ab0f6b97f4c0808ee64b72506541a53d0
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 10:21:48 2019 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 10:22:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df5299a

app-emulation/containerd: Wait for containerd socket

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-emulation/containerd/files/containerd.initd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd
index f0f4e735b5a..bedf000cad5 100644
--- a/app-emulation/containerd/files/containerd.initd
+++ b/app-emulation/containerd/files/containerd.initd
@@ -18,3 +18,7 @@ start_pre() {
 
 	return 0
 }
+
+start_post() {
+	ewaitfile 5 /run/containerd/containerd.sock
+}