diff options
Diffstat (limited to 'app-emulation/containerd/files')
-rw-r--r-- | app-emulation/containerd/files/containerd.initd | 8 | ||||
-rw-r--r-- | app-emulation/containerd/files/containerd.initd-r1 | 26 |
2 files changed, 5 insertions, 29 deletions
diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd index bedf000cad5b..6536fc9ef209 100644 --- a/app-emulation/containerd/files/containerd.initd +++ b/app-emulation/containerd/files/containerd.initd @@ -1,14 +1,16 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Containerd container runtime" command="/usr/bin/containerd" +command_args="${command_args:-}" +command_background="true" pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}" -start_stop_daemon_args="--background --make-pidfile --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" +start_stop_daemon_args="--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} + checkpath -m 0750 -d "/var/log/${RC_SVCNAME}" ulimit -n 1048576 diff --git a/app-emulation/containerd/files/containerd.initd-r1 b/app-emulation/containerd/files/containerd.initd-r1 deleted file mode 100644 index 6536fc9ef209..000000000000 --- a/app-emulation/containerd/files/containerd.initd-r1 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Containerd container runtime" -command="/usr/bin/containerd" -command_args="${command_args:-}" -command_background="true" -pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}" -start_stop_daemon_args="--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 - # in the kernel. We recommend using cgroups to do container-local accounting. - ulimit -u unlimited - - return 0 -} - -start_post() { - ewaitfile 5 /run/containerd/containerd.sock -} |