From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 18 Nov 2011 19:47:44 +0000 (+0000)
Subject: Remove files generated by older yaim - upgrade L&B from version <= 3.1.1.
X-Git-Tag: merge_30_head_take2_src~19
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1bd02f4cab5d68f724d22264b884c5e8c83ed3a1;p=jra1mw.git

Remove files generated by older yaim - upgrade L&B from version <= 3.1.1.
---

diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in
index 3bf21e2..8d359ae 100644
--- a/org.glite.lb.yaim/config/functions/config_glite_lb.in
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in
@@ -175,15 +175,6 @@ function config_glite_lb() {
     return 1
   fi
 
-  LB_PURGE="$GLITE_LB_LOCATION/bin/glite-lb-purge"
-  if [ ! -x "$LB_PURGE" ]; then
-    LB_PURGE="$GLITE_LB_LOCATION/sbin/glite-lb-purge"
-  fi
-  if [ ! -x "$LB_PURGE" ]; then
-    yaimlog ABORT "Purge utility not found! Install glite-lb-utils (or glite-lb-client in older version)"
-    return 1
-  fi
-
   chmod og+rx /var/lib/mysql/ 
   chown mysql:mysql /var/run/mysqld/
 
@@ -348,6 +339,9 @@ EOF
     echo $HOSTNAME > ${GLITE_LB_LOCATION_ETC}/glite-lb/glite-lb-harvester.conf
   fi
 
+  # upgrade from L&B <= 3.1.1
+  rm -fv /etc/cron.d/glite-lb-purge.cron /etc/logrotate.d/lb-purger /etc/logrotate.d/lb-lcas
+
   . @glite_etc@/profile.d/grid-env.sh
   ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd restart