From 75140c735bcd5289dfac7cfb880c78744ba97c36 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 10 Nov 2010 12:59:07 +0000 Subject: [PATCH] 2010-11- Miguel de Dios * DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use pandora_exec for Pandora Server and Pandora Agent, now make a pandora_exec.server and try to link to pandora_exec. Fixes: #3106578 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3566 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 ++++++++ pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/DEBIAN/postinst | 3 +++ pandora_server/DEBIAN/prerm | 6 ++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 5bfcca8624..baa047f8b9 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2010-11- Miguel de Dios + + * DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use + pandora_exec for Pandora Server and Pandora Agent, now make a + pandora_exec.server and try to link to pandora_exec. + + Fixes: #3106578 + 2010-11-10 Junichi Satoh * lib/PandoraFMS/Tools.pm: Added a parameter of unsafe_chars, '<>&', diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 1163f977e3..c394756ad2 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -82,7 +82,7 @@ then mkdir -p temp_package/usr/share/man/man1/ cp -aRf bin/pandora_server temp_package/usr/bin/ - cp -aRf bin/pandora_exec temp_package/usr/bin/ + cp -aRf bin/pandora_exec temp_package/usr/bin/pandora_exec.server cp -aRf bin/tentacle_server temp_package/usr/bin/ cp -aRf conf/* temp_package/usr/share/pandora_server/conf/ diff --git a/pandora_server/DEBIAN/postinst b/pandora_server/DEBIAN/postinst index 5c590f1706..804496f5ab 100755 --- a/pandora_server/DEBIAN/postinst +++ b/pandora_server/DEBIAN/postinst @@ -55,6 +55,9 @@ get_distro () { echo "$LINUX_DISTRO:$OS_VERSION:$LINUX" } +echo "Linking pandora_exec..." +ln -s /usr/bin/pandora_exec.server /usr/bin/pandora_exec 2> /dev/null + echo "Creating common Pandora FMS directories" useradd pandora 2> /dev/null diff --git a/pandora_server/DEBIAN/prerm b/pandora_server/DEBIAN/prerm index fb5a81e8b1..ec5a25a8d9 100755 --- a/pandora_server/DEBIAN/prerm +++ b/pandora_server/DEBIAN/prerm @@ -70,3 +70,9 @@ then rm /etc/cron.daily/pandora_db fi +rm /usr/bin/pandora_exec +if [ -e /usr/bin/pandora_exec.agent ] +then + ln -s /usr/bin/pandora_exec.agent /usr/bin/pandora_exec 2> /dev/null +fi +