From 26b6886f3924bfabf044b36f3bf1092e4f85f6d3 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Tue, 10 Nov 2020 13:27:51 -0800
Subject: app-emulation/containerd: cleanup filesdir

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 app-emulation/containerd/containerd-1.3.7.ebuild   |  2 +-
 app-emulation/containerd/files/containerd.initd    | 26 ++++++++++++++++++++++
 app-emulation/containerd/files/containerd.initd-r1 | 26 ----------------------
 3 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 app-emulation/containerd/files/containerd.initd
 delete mode 100644 app-emulation/containerd/files/containerd.initd-r1

(limited to 'app-emulation')

diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
index 583c12cb94ad..b6ed4b2e74c2 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -73,7 +73,7 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
 	keepdir /var/lib/containerd
 
 	# we already installed manpages, remove markdown source
diff --git a/app-emulation/containerd/files/containerd.initd b/app-emulation/containerd/files/containerd.initd
new file mode 100644
index 000000000000..6536fc9ef209
--- /dev/null
+++ b/app-emulation/containerd/files/containerd.initd
@@ -0,0 +1,26 @@
+#!/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
+}
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
-}
-- 
cgit v1.2.3-65-gdbad