From 4574ed56a28e40c309a50b410f312c5e5d485b3c Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Fri, 5 Jan 2007 18:16:31 +0000
Subject: [PATCH] 2007-01-05  Sancho Lerena  <slerena@artica.es>

	* linux/pandora_agent_daemon: Some adjustements for a generic
	daemon launcher. Need to be improved with some code from Dagget
	and Manu.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/ChangeLog                  |  6 ++++++
 pandora_agents/linux/pandora_agent_daemon | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index c6b7ee1b71..79f2b101eb 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Sancho Lerena  <slerena@artica.es>
+
+	* linux/pandora_agent_daemon: Some adjustements for a generic
+	daemon launcher. Need to be improved with some code from Dagget
+	and Manu.
+
 2007-01-04  Sancho Lerena  <slerena@artica.es>
 
 	* Linux/pandora_agent.sh: Solved problem with encoding. Now XML
diff --git a/pandora_agents/linux/pandora_agent_daemon b/pandora_agents/linux/pandora_agent_daemon
index 68e0b06fb0..8c018cee23 100755
--- a/pandora_agents/linux/pandora_agent_daemon
+++ b/pandora_agents/linux/pandora_agent_daemon
@@ -16,14 +16,14 @@
 ### END INIT INFO
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-PANDORA_PATH=/opt/pandora_agent/
-DAEMON=pandora_agent.sh
+PANDORA_PATH=/etc/pandora
+DAEMON=/usr/bin/pandora_agent
 PIDFILE=/var/run/pandora_agent.pid
 
 
-if [ ! -f $PANDORA_PATH/$DAEMON ]
+if [ ! -f $DAEMON ]
 then
-	echo "Pandora Agent not found at $PANDORA_PATH/$DAEMON, please check setup"
+	echo "Pandora Agent not found at $DAEMON, please check setup"
 	exit
 fi
 
@@ -34,7 +34,7 @@ case "$1" in
                 echo "Pandora Agent is currently running on this machine. Aborting now..."
                 exit
         fi
-        $PANDORA_PATH/$DAEMON $PANDORA_PATH >> $PANDORA_PATH/pandora.log &  MYPID=$!
+        $DAEMON $PANDORA_PATH >> $PANDORA_PATH/pandora.log &  MYPID=$!
         echo $MYPID > $PIDFILE
 	echo "Pandora Agent is now running with PID $MYPID"
         ;;