[packages/nagios/nagios-3.2] fix $HOME env var

glen glen at pld-linux.org
Fri Aug 7 15:17:50 CEST 2015


commit bac2dfe4664c072da447ecfe13f5b1a48eb98def
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Apr 23 15:51:26 2015 +0300

    fix $HOME env var

 nagios.init | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/nagios.init b/nagios.init
index d9d0a18..20988bb 100644
--- a/nagios.init
+++ b/nagios.init
@@ -27,6 +27,10 @@ fi
 
 cfg_file=/etc/nagios/nagios.cfg
 
+# value to use for $HOME
+# as pld initscript resets HOME=/tmp, plugins may inherit bad value
+nagios_home=/usr/lib/nagios
+
 # check for precache
 precached_object_file=$(awk -F= '/^precached_object_file/{print $2}' $cfg_file)
 
@@ -79,7 +83,7 @@ start() {
 
 	# we're safe to use -x as we did verify config prior startup
 	# precached object file also is created in configtest.
-	daemon /usr/sbin/nagios ${precached_object_file:+-u} -x -d $cfg_file
+	daemon env -i PATH="$PATH" HOME="$nagios_home" /usr/sbin/nagios ${precached_object_file:+-u} -x -d $cfg_file
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 		touch /var/lock/subsys/nagios
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/c656baa8558b1f8a6e186ebb43b65a247d8ca2f0



More information about the pld-cvs-commit mailing list