From 3c75c7c603b98d1bb08f4fc9d7395ae9c7f4a52c Mon Sep 17 00:00:00 2001 From: jsatoh Date: Sat, 4 Dec 2010 06:22:44 +0000 Subject: [PATCH] 2010-12-04 Junichi Satoh * unix/plugins/pandora_update: Added support for FreeBSD. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3653 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 4 ++++ pandora_agents/unix/ChangeLog | 4 ++++ pandora_agents/unix/plugins/pandora_update | 22 ++++++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index deaa46dc4e..2d2c8c3949 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,7 @@ +2010-12-04 Junichi Satoh + + * unix/plugins/pandora_update: Added support for FreeBSD. + 2010-12-02 Junichi Satoh * unix/SunOS/make_solaris_package/prototype: Added pandora_update. diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 07786a7bff..27598069b6 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,7 @@ +2010-12-04 Junichi Satoh + + * plugins/pandora_update: Added support for FreeBSD. + 2010-12-02 Junichi Satoh * SunOS/make_solaris_package/prototype: Added pandora_update. diff --git a/pandora_agents/unix/plugins/pandora_update b/pandora_agents/unix/plugins/pandora_update index c13a9bec8e..caa86960e2 100755 --- a/pandora_agents/unix/plugins/pandora_update +++ b/pandora_agents/unix/plugins/pandora_update @@ -104,8 +104,15 @@ my $base_path = return_basepath(); # Location of binaries # Unix -my $running_binary = "/usr/bin/pandora_agent"; -my $updated_binary = "/etc/pandora/collections/$fc_path/pandora_agent"; +my $running_binary; +my $updated_binary; +if ($^O eq 'freebsd') { + $running_binary = "/usr/local/bin/pandora_agent"; + $updated_binary = "/usr/local/etc/pandora/collections/$fc_path/pandora_agent"; +} else { + $running_binary = "/usr/bin/pandora_agent"; + $updated_binary = "/etc/pandora/collections/$fc_path/pandora_agent"; +} # Windows @@ -116,8 +123,15 @@ my $updated_binary = "/etc/pandora/collections/$fc_path/pandora_agent"; # Unix style -my $start_pandora = "/etc/init.d/pandora_agent_daemon start"; -my $stop_pandora = "/etc/init.d/pandora_agent_daemon stop"; +my $start_pandora; +my $stop_pandora; +if ($^O eq 'freebsd') { + $start_pandora = "/usr/local/etc/rc.d/pandora_agent start"; + $stop_pandora = "/usr/local/etc/rc.d/pandora_agent stop"; +} else { + $start_pandora = "/etc/init.d/pandora_agent_daemon start"; + $stop_pandora = "/etc/init.d/pandora_agent_daemon stop"; +} # Windows stuff