From 8365aeae0262cd8f90e78431efb8f30e4ebdaccd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 28 Mar 2011 17:49:17 +0000 Subject: [PATCH] Update due to latest changes in yaim-core. --- org.glite.lb.yaim/config/functions/config_glite_lb.in | 8 ++++---- org.glite.lb.yaim/config/functions/emi/config_info_service_lb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 d798040..74122d9 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb.in +++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in @@ -14,7 +14,7 @@ function config_glite_lb_libs_append() { fi libarch=${libarch:-'lib'} - if [ -d "$prefix/$libarch" ]; then + if [ -d "$prefix/$libarch" -a "$prefix" != "/usr" ]; then yaimgridpath_append LD_LIBRARY_PATH "$prefix/$libarch" fi } @@ -384,9 +384,9 @@ EOF echo $HOSTNAME > ${GLITE_LB_LOCATION_ETC}/glite-lb/glite-lb-harvester.conf fi - . ${GLITE_LOCATION}/etc/profile.d/grid-env.sh - ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd stop - ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd start + . /opt/glite/yaim/etc/grid-env-funcs.sh + . ${GRID_ENV_LOCATION}/grid-env.sh + ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd restart if [ ! $? = 0 ] ; then yaimlog ABORT "Service glite-lb-bkserverd failed to start!" diff --git a/org.glite.lb.yaim/config/functions/emi/config_info_service_lb b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb index b28d47d..1af4162 100644 --- a/org.glite.lb.yaim/config/functions/emi/config_info_service_lb +++ b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb @@ -31,7 +31,7 @@ ############################################################################## config_info_service_lb_check () { - requires $1 SITE_NAME INSTALL_ROOT + requires $1 SITE_NAME } config_info_service_lb_setenv () { -- 1.8.2.3