summaryrefslogtreecommitdiff
path: root/app-emulation/flannel
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2017-09-01 15:22:44 -0700
committerZac Medico <zmedico@gentoo.org>2017-09-01 15:29:17 -0700
commit40f02a0eaee5422f5eeb2b3dd7c7dd5c6b926cd5 (patch)
treee24223f31123c50f76761572accdf5822770bff0 /app-emulation/flannel
parentd8f3cf3b2abbcfe668b6251d05926a15d912a870 (diff)
downloadgentoo-40f02a0eaee5422f5eeb2b3dd7c7dd5c6b926cd5.tar.gz
gentoo-40f02a0eaee5422f5eeb2b3dd7c7dd5c6b926cd5.tar.xz
app-emulation/flannel: revbump to 0.8.0-r2 for bug 629170
Package-Manager: Portage-2.3.8, Repoman-2.3.2
Diffstat (limited to 'app-emulation/flannel')
-rw-r--r--app-emulation/flannel/files/flanneld.initd9
-rw-r--r--app-emulation/flannel/flannel-0.8.0-r2.ebuild (renamed from app-emulation/flannel/flannel-0.8.0-r1.ebuild)0
2 files changed, 2 insertions, 7 deletions
diff --git a/app-emulation/flannel/files/flanneld.initd b/app-emulation/flannel/files/flanneld.initd
index 6f75abd40f5..d5d966a40d3 100644
--- a/app-emulation/flannel/files/flanneld.initd
+++ b/app-emulation/flannel/files/flanneld.initd
@@ -3,11 +3,11 @@
# Distributed under the terms of the GNU General Public License v2
description="Flannel Network Fabric for Containers"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
user=${user:-root}
group=${group:-root}
-command="/usr/bin/${SVCNAME}"
+command="/usr/bin/${RC_SVCNAME}"
command_args="${command_args}"
command_background="true"
start_stop_daemon_args="--user ${user} --group ${group} \
@@ -16,9 +16,4 @@ start_stop_daemon_args="--user ${user} --group ${group} \
depend() {
need net
- after net
-}
-
-start_pre() {
- checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
}
diff --git a/app-emulation/flannel/flannel-0.8.0-r1.ebuild b/app-emulation/flannel/flannel-0.8.0-r2.ebuild
index 5135efe94f8..5135efe94f8 100644
--- a/app-emulation/flannel/flannel-0.8.0-r1.ebuild
+++ b/app-emulation/flannel/flannel-0.8.0-r2.ebuild