From 260bf186451e53ab0b46c414c27ebc761f367a19 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 1 Nov 2010 19:58:21 +0000 Subject: [PATCH] 2010-11-01 Miguel de Dios * DEBIAN/postinst, DEBIAN/conffiles, DEBIAN/make_deb_package.sh: fixed the warning of check md5sum on dir "plugins". Now the dir "plugins" is filled postinstall with the package plugins in temp directory, the copy is interactive for don't overwrite the user modified plugins of previous installation. Fixes: #3081496 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3489 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/DEBIAN/conffiles | 1 - pandora_agents/unix/DEBIAN/make_deb_package.sh | 6 ++++++ pandora_agents/unix/DEBIAN/postinst | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pandora_agents/unix/DEBIAN/conffiles b/pandora_agents/unix/DEBIAN/conffiles index dae6551ac7..0a0587e3db 100755 --- a/pandora_agents/unix/DEBIAN/conffiles +++ b/pandora_agents/unix/DEBIAN/conffiles @@ -1,2 +1 @@ /etc/pandora/pandora_agent.conf -/etc/pandora/plugins diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index d9e9c4f96a..28efbf13d5 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -39,6 +39,8 @@ mkdir -p temp_package/etc/pandora/collections mkdir -p temp_package/etc/init.d/ mkdir -p temp_package/var/log/pandora/ mkdir -p temp_package/usr/share/man/man1/ +mkdir -p temp_package/usr/share/pandora_agent/plugins +mkdir -p temp_package/tmp echo "Make directory system tree for package." cp DEBIAN temp_package -R @@ -63,6 +65,10 @@ cp Linux/pandora_agent.conf temp_package/etc/pandora/ cp -aRf man/man1/* temp_package/usr/share/man/man1/ +#Create a temp file for to update files of plugins dir but don't crush dir. +cp -aRf temp_package/usr/share/pandora_agent/plugins temp_package/tmp +rm -rf temp_package/usr/share/pandora_agent/plugins/* + echo "Remove the SVN files and other temp files." for item in `find temp_package` do diff --git a/pandora_agents/unix/DEBIAN/postinst b/pandora_agents/unix/DEBIAN/postinst index 664888e41c..1b18887746 100755 --- a/pandora_agents/unix/DEBIAN/postinst +++ b/pandora_agents/unix/DEBIAN/postinst @@ -9,6 +9,10 @@ PANDORA_CFG=/etc/pandora LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"` +echo "Copy new version of plugins into dir" +cp -i /tmp/plugins/* /usr/share/pandora_agent/plugins/ +rm /tmp/plugins -rf + echo "Linking Pandora FMS Agent plugins directory to $PANDORA_CFG/plugins..." rm $PANDORA_CFG/plugins 2> /dev/null ln -s $PANDORA_HOME/plugins $PANDORA_CFG 2> /dev/null