diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 14ce105bb4..b43451494b 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,7 @@ +2011-09-05 Koichiro Kikuchi + + * pandora_agent_daemon: Added support for OpenVZ/Virtuozzo. + 2011-09-02 Koichiro Kikuchi * pandora_agent: Now module_condition and module_precondition diff --git a/pandora_agents/unix/pandora_agent_daemon b/pandora_agents/unix/pandora_agent_daemon index d5ddb4abaf..c237568600 100755 --- a/pandora_agents/unix/pandora_agent_daemon +++ b/pandora_agents/unix/pandora_agent_daemon @@ -52,6 +52,17 @@ pidof_pandora () { else PANDORA_PID=`ps -Af | grep "$TRUNCATED_DAEMON" | grep -v grep | head -1 | awk '{ print $2 }'` fi + elif [ "$OS_NAME" = "Linux" -a -x /usr/sbin/vzpid ] + then + for _pid in `ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'` + do + _ctid=`/usr/sbin/vzpid $_pid | awk '$1 == '$_pid' { print $2 }'` + if [ "X$_ctid" = "X0" ] + then + PANDORA_PID=$_pid + break + fi + done else PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'` fi