From 532b4fbdf7468bc1b2d1e5b6e68156311d6fa344 Mon Sep 17 00:00:00 2001 From: darode Date: Mon, 4 Apr 2011 15:49:13 +0000 Subject: [PATCH] 2011-04-04 Dario Rodriguez * plugins/pandora_update: Fixed a problem getting pandora_agent pid in SunOS. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/plugins/pandora_update | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index ba32fe4a10..0c6e7b40f5 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Dario Rodriguez + + * plugins/pandora_update: Fixed a problem getting pandora_agent pid + in SunOS. + 2011-04-04 Dario Rodriguez * pandora_agent_installer: Added correct user to tentacle_client binary. diff --git a/pandora_agents/unix/plugins/pandora_update b/pandora_agents/unix/plugins/pandora_update index 8779e0329f..f1e8dfa4e4 100755 --- a/pandora_agents/unix/plugins/pandora_update +++ b/pandora_agents/unix/plugins/pandora_update @@ -94,17 +94,19 @@ sub get_agent_pid ($$) { if ($os_name eq "HP-UX") { - $cmd ="ps -ex | grep \"$daemon $app_path\" | grep -v grep | head -1 | awk '{ print \$1 }'"; + $cmd ="ps -ex | grep \"$daemon $app_path\" | grep -v grep | head -1 | awk '{ print \$1 }'"; } - elsif ($os_name eq "SunOS") { + elsif ($os_name =~ /SunOS/) { my $cmd_aux="echo \"$daemon $app_path\" | cut -c1-40"; my $truncated_daemon = `$cmd_aux`; - my $zone = `/bin/zonename`; - - if ( $zone eq "global") { - $cmd ="ps -f -z global | grep \"$truncated_daemon\" | grep -v grep | head -1 | awk '{ print \$2 }'"; - } else { + chop($truncated_daemon); + + my $zone = `/bin/zonename`; + + if ( $zone =~ /global/) { + $cmd ="ps -f -z global | grep \"$truncated_daemon\" | grep -v grep | head -1 | awk '{ print \$2 }'"; + } else { $cmd ="ps -Af | grep \"$truncated_daemon\" | grep -v grep | head -1 | awk '{ print \$2 }'"; } } else {