From 1ee2322e81b66b900a57e9d7602110aab2f319ca Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Thu, 5 Aug 2021 16:27:40 +0200
Subject: [PATCH] net-misc/bird: Init improvement for non-root usage

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr
---
 net-misc/bird/files/initd-bird-2 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
index 3b759df..0a0cbe8 100644
--- a/net-misc/bird/files/initd-bird-2
+++ b/net-misc/bird/files/initd-bird-2
@@ -5,13 +5,12 @@
 
 extra_started_commands="reload"
 
-pidfile="/run/${RC_SVCNAME}.pid"
+pidfile="/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"
 command="/usr/sbin/${RC_SVCNAME}"
 retry=15
-start_stop_daemon_args="--make-pidfile"
 
 CONF_FILE="/etc/${RC_SVCNAME}.conf"
-SOCK="/run/${RC_SVCNAME}.ctl"
+SOCK="/run/${RC_SVCNAME}/${RC_SVCNAME}.ctl"
 
 if [ ${BIRD_GROUP} ]; then
 	BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}"
@@ -25,7 +24,7 @@ command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}"
 client_args="${client_args} -r"
 
 depend() {
-	need net
+	use net
 	use logger
 }
 
@@ -52,8 +51,12 @@ reload() {
 	eend $?
 }
 
+start_pre() {
+	checkpath -d -m 0755 -o bird:bird "/run/${RC_SVCNAME}"
+}
+
 start_post() {
-	checkpath -f -m 0655 -o bird:bird "${pidfile}"
+	ln -sf "${SOCK}" /run
 }
 
 stop_pre() {