From b1d09d32ff4560d15b679a39456ddc8a617760ea Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Mon, 5 Dec 2011 15:41:33 +0000
Subject: [PATCH] 2011-12-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandora_server_upgrade: Removed rm of pandora_exec and
pandora_server and changed for ln -s commands.
Fixes: #3451305
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5233 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_server/ChangeLog | 7 +++++++
pandora_server/pandora_server_upgrade | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index f680c2ab17..47c1c622ab 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+ * pandora_server_upgrade: Removed rm of pandora_exec and
+ pandora_server and changed for ln -s commands.
+
+ Fixes: #3451305
+
2011-12-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/NetworkServer.pm
diff --git a/pandora_server/pandora_server_upgrade b/pandora_server/pandora_server_upgrade
index 14c2d0a425..48664d146d 100755
--- a/pandora_server/pandora_server_upgrade
+++ b/pandora_server/pandora_server_upgrade
@@ -29,11 +29,12 @@ install () {
echo "Copying utilities...."
cp -R util /usr/share/pandora_server
- cp bin/pandora_exec /usr/bin
echo "Rebuilding links /usr/local/bin -> /usr/bin"
- rm /usr/local/bin/pandora_server 2> /dev/null
- rm /usr/local/bin/pandora_exec 2> /dev/null
+ #rm /usr/local/bin/pandora_server 2> /dev/null
+ #rm /usr/local/bin/pandora_exec 2> /dev/null
+ ln -s /usr/local/bin/pandora_server /usr/bin/pandora_server 2> /dev/null
+ ln -s /usr/local/bin/pandora_exec /usr/bin/pandora_exec 2> /dev/null
if [ -d /etc/logrotate.d ]; then
echo "Creating logrotate.d entry for Pandora FMS log management"
@@ -65,7 +66,7 @@ help () {
# Script banner at start
echo " "
-echo "Pandora FMS 3.2 Server Upgrade (c) 2009-2010 Artica ST"
+echo "Pandora FMS 4.0dev Server Upgrade (c) 2009-2010 Artica ST"
echo "This program is licensed under GPL2 Terms. http://pandorafms.org"
echo " "