From: Toke Høiland-Jørgensen <redacted>
Date: Fri, 5 Aug 2016 15:49:33 +0000 (+0200)
Subject: freeradius2/3: Fixes to init script. (#3022)
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6be33929b8dbdf11bd64dfb3c89530998fd7bc43;p=openwrt-packages.git

freeradius2/3: Fixes to init script. (#3022)

This fixes two issues with the freeradius package init scripts:

- The package installs libraries in /usr/lib/freeradius{2,3}, but the
  musl dynamic linker won't find them there unless LD_LIBRARY_PATH is
  set to include this directory. This adds an appropriate env statement
  to the procd init setup.

- procd expects services to stay in the foreground, or it will be unable
  to properly shut them down again. This adds the -f flag to radiusd to
  achieve that.

Signed-off-by: Toke Høiland-Jørgensen <redacted>
---

diff --git a/net/freeradius2/files/radiusd.init b/net/freeradius2/files/radiusd.init
index e529a8891..8cd1aad0b 100644
--- a/net/freeradius2/files/radiusd.init
+++ b/net/freeradius2/files/radiusd.init
@@ -19,7 +19,8 @@ start_service()
 	mkdir -p /var/db/radacct
 
 	procd_open_instance
-	procd_set_param command $PROG
+	procd_set_param command $PROG -f
+	procd_set_param env LD_LIBRARY_PATH=/usr/lib/freeradius2
 	[ -n "$IPADDR" ] && procd_append_param command -i $IPADDR
 	[ -n "$OPTIONS" ] && procd_append_param command $OPTIONS
 	procd_set_param respawn
diff --git a/net/freeradius3/files/radiusd.init b/net/freeradius3/files/radiusd.init
index e529a8891..f9ad433a7 100644
--- a/net/freeradius3/files/radiusd.init
+++ b/net/freeradius3/files/radiusd.init
@@ -19,7 +19,8 @@ start_service()
 	mkdir -p /var/db/radacct
 
 	procd_open_instance
-	procd_set_param command $PROG
+	procd_set_param command $PROG -f
+	procd_set_param env LD_LIBRARY_PATH=/usr/lib/freeradius3
 	[ -n "$IPADDR" ] && procd_append_param command -i $IPADDR
 	[ -n "$OPTIONS" ] && procd_append_param command $OPTIONS
 	procd_set_param respawn