From 9c8c2f94ebce759d2023bef6a60632000667152e Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 18 Dec 2009 15:48:18 +0000 Subject: [PATCH] 2009-12-18 Sancho Lerena * unix/pandora_agent_installer, * linux/DEBIAN/control, * linux/pandora_agent.spec: Updated versions. * unix/pandora_agent: Fixed bug #2887050. Updated version git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2218 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 8 ++++++++ pandora_agents/linux/DEBIAN/control | 2 +- pandora_agents/linux/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent | 9 ++------- pandora_agents/unix/pandora_agent_installer | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index a07fa9c049..96755f1345 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,11 @@ +2009-12-18 Sancho Lerena + + * unix/pandora_agent_installer, + * linux/DEBIAN/control, + * linux/pandora_agent.spec: Updated versions. + + * unix/pandora_agent: Fixed bug #2887050. Updated version + 2009-12-17 Miguel de Dios * linux/DEBIAN/postinst: change the code to insert as service the agent. diff --git a/pandora_agents/linux/DEBIAN/control b/pandora_agents/linux/DEBIAN/control index 6ec731f47b..eeeaeb2769 100755 --- a/pandora_agents/linux/DEBIAN/control +++ b/pandora_agents/linux/DEBIAN/control @@ -1,5 +1,5 @@ package: PandoraFMS-Agent -Version: 3.0.0.RC3 +Version: 3.0.0 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/linux/pandora_agent.spec b/pandora_agents/linux/pandora_agent.spec index f9fef01525..357f77bc87 100755 --- a/pandora_agents/linux/pandora_agent.spec +++ b/pandora_agents/linux/pandora_agent.spec @@ -6,7 +6,7 @@ Summary: Pandora FMS Linux agent Name: %{name} Version: %{version} -Release: 2 +Release: 4 License: GPL Vendor: ArticaST Source0: %{name}-%{version}.tar.gz diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 89ead0dc57..c7d1c65de9 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -486,18 +486,13 @@ sub guess_os_version ($) { # Linux return `lsb_release -sd` if ($os eq 'linux'); - # Solaris - return `uname -r` if ($os eq 'solaris'); - # AIX if ($os eq 'aix') { return "$2.$1" if (`uname -rv` =~ /\s*(\d)\s+(\d)\s*/); } - # HP-UX - return `uname -r` if ($os eq 'aix'); - - return ''; + # Solaris, HP-UX, BSD and others + return `uname -r`; } ################################################################################ diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 10a930db9a..e409fbbec9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -7,7 +7,7 @@ # # This is a generic installer for all Unix-like systems.(AIX, HP-UX, SunOS, Linux) # Please see http://www.pandorafms.org -# v3.0 Build 091103 +# v3.0 Build 091215 # This code is licensed under GPL 2.0 license. # **********************************************************************