From 545a0c13cf6cd177203b726faf39da291645065b Mon Sep 17 00:00:00 2001 From: jsatoh Date: Mon, 27 Sep 2010 01:56:08 +0000 Subject: [PATCH] 2010-09-27 Junichi Satoh * unix/FreeBSD/pandora_agent: Changed PID detection method to support "jail", FreeBSD virtualization. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 5 +++++ pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/FreeBSD/pandora_agent | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 4b0d920dc9..dbbb34ac28 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Junichi Satoh + + * unix/FreeBSD/pandora_agent: Changed PID detection method to support + "jail", FreeBSD virtualization. + 2010-09-27 Junichi Satoh * unix/pandora_agent_installer: Set PANDORA_USER="root" when it is diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 554948df4c..7f11343e5b 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Junichi Satoh + + * FreeBSD/pandora_agent: Changed PID detection method to support + "jail", FreeBSD virtualization. + 2010-09-27 Junichi Satoh * pandora_agent_installer: Set PANDORA_USER="root" when it is not diff --git a/pandora_agents/unix/FreeBSD/pandora_agent b/pandora_agents/unix/FreeBSD/pandora_agent index 720eec9eda..223e25b37e 100755 --- a/pandora_agents/unix/FreeBSD/pandora_agent +++ b/pandora_agents/unix/FreeBSD/pandora_agent @@ -39,7 +39,7 @@ procname="/usr/bin/perl" start_postcmd() { sleep 1 - PANDORA_PID=`ps auxww | grep $command | grep -v grep | head -1 | awk '{ print $2 }'` + PANDORA_PID=`pgrep -f -j none $mame` echo $PANDORA_PID > $pidfile }