From 83357ec7ea7174806996f7d6a430c71754d63efa Mon Sep 17 00:00:00 2001 From: jsatoh Date: Mon, 27 Sep 2010 02:00:36 +0000 Subject: [PATCH] 2010-09-27 Junichi Satoh * FreeBSD/pandora_server, FreeBSD/tentacle_server: Changed PID detection method to support "jail", FreeBSD virtualization. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3296 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/FreeBSD/pandora_server | 2 +- pandora_server/FreeBSD/tentacle_server | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b8e30c9b1d..19252f7908 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Junichi Satoh + + * FreeBSD/pandora_server, FreeBSD/tentacle_server: Changed PID + detection method to support "jail", FreeBSD virtualization. + 2010-09-24 Sergio Martin * util/pandora_manage.pl: Added the apply_policy diff --git a/pandora_server/FreeBSD/pandora_server b/pandora_server/FreeBSD/pandora_server index f8790d9de8..917c5cac92 100755 --- a/pandora_server/FreeBSD/pandora_server +++ b/pandora_server/FreeBSD/pandora_server @@ -38,7 +38,7 @@ procname="/usr/local/bin/perl" start_postcmd() { - 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 } diff --git a/pandora_server/FreeBSD/tentacle_server b/pandora_server/FreeBSD/tentacle_server index e3f3e05f94..3876ee17d1 100755 --- a/pandora_server/FreeBSD/tentacle_server +++ b/pandora_server/FreeBSD/tentacle_server @@ -38,7 +38,7 @@ procname="/usr/bin/perl" start_postcmd() { - TENTACLE_PID=`ps auxww | grep $command | grep -v grep | head -1 | awk '{ print $2 }'` + PANDORA_PID=`pgrep -f -j none $mame` echo $TENTACLE_PID > $pidfile }