From 672e84c984c6aa715f1fc915744e4b9d08860677 Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Wed, 10 Feb 2010 17:37:48 +0000
Subject: [PATCH] 2010-02-09 Sancho Lerena <slerena@artica.es>
* unix/pandora_agent_daemon
* unix/pandora_agent.spec
* linux/pandora_agent_daemon
* linux/pandora_agent.spec: Fixed some compatibility issues with
CentOS LSB and RPM package.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_agents/ChangeLog | 9 +++++++++
pandora_agents/linux/pandora_agent.spec | 4 ++--
pandora_agents/linux/pandora_agent_daemon | 1 +
pandora_agents/unix/pandora_agent.spec | 4 ++--
pandora_agents/unix/pandora_agent_daemon | 10 ++++++++++
5 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 81b0b090f3..2e1d1942a3 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,12 @@
+
+2010-02-09 Sancho Lerena <slerena@artica.es>
+
+ * unix/pandora_agent_daemon
+ * unix/pandora_agent.spec
+ * linux/pandora_agent_daemon
+ * linux/pandora_agent.spec: Fixed some compatibility issues with
+ CentOS LSB and RPM package.
+
2010-01-12 Pablo de la Concepcipón <pablo.concepcion@artica.es>
* unix/Linux/pandora_agent.conf, unix/AIX/pandora_agent.conf,
diff --git a/pandora_agents/linux/pandora_agent.spec b/pandora_agents/linux/pandora_agent.spec
index 71502a88ea..c2fb36d685 100755
--- a/pandora_agents/linux/pandora_agent.spec
+++ b/pandora_agents/linux/pandora_agent.spec
@@ -92,11 +92,11 @@ if [ ! -d /var/spool/pandora/data_out ] ; then
mkdir -p /var/spool/pandora/data_out
fi
-chkconfig -s pandora_agent_daemon on
+chkconfig pandora_agent_daemon on
%preun
-chkconfig -d pandora_agent_daemon
+chkconfig --del pandora_agent_daemon
/etc/init.d/pandora_agent_daemon stop
rm /etc/init.d/pandora_agent_daemon
/usr/sbin/userdel pandora
diff --git a/pandora_agents/linux/pandora_agent_daemon b/pandora_agents/linux/pandora_agent_daemon
index dc99b62efd..1d141c32fc 100755
--- a/pandora_agents/linux/pandora_agent_daemon
+++ b/pandora_agents/linux/pandora_agent_daemon
@@ -14,6 +14,7 @@
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: Startup script daemon for Pandora FMS agent
+# Description: Startup script daemon for Pandora FMS agent (linux)
### END INIT INFO
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 0227296743..954c9a6158 100755
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -84,11 +84,11 @@ if [ ! -e /etc/pandora/plugins ]; then
fi
mkdir -p /var/spool/pandora/data_out
-chkconfig -s pandora_agent_daemon on
+chkconfig pandora_agent_daemon on
%preun
-chkconfig -d pandora_agent_daemon
+chkconfig --del pandora_agent_daemon
/etc/init.d/pandora_agent_daemon stop
rm /etc/init.d/pandora_agent_daemon
/usr/sbin/userdel pandora
diff --git a/pandora_agents/unix/pandora_agent_daemon b/pandora_agents/unix/pandora_agent_daemon
index eb71a47dae..a134658acc 100755
--- a/pandora_agents/unix/pandora_agent_daemon
+++ b/pandora_agents/unix/pandora_agent_daemon
@@ -10,6 +10,16 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
+### BEGIN INIT INFO
+# Provides: pandora_agent
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start: 2 3 5
+# Default-Stop: 0 1 6
+# Short-Description: Startup script daemon for Pandora FMS agent
+# Description: Startup script daemon for Pandora FMS agent (linux)
+### END INIT INFO
+
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
PANDORA_PATH=/etc/pandora
DAEMON=/usr/bin/pandora_agent