From 1f50585e357be7d47026edb32c8c892d9106490b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 18 Jan 2013 17:02:53 +0000 Subject: [PATCH] Fix merged change (env name change for L&B 4). --- org.glite.lb.yaim/config/defaults/glite-lb.pre | 4 ++-- org.glite.lb.yaim/config/functions/config_glite_lb.in | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.yaim/config/defaults/glite-lb.pre b/org.glite.lb.yaim/config/defaults/glite-lb.pre index a0206c4..ddfa746 100644 --- a/org.glite.lb.yaim/config/defaults/glite-lb.pre +++ b/org.glite.lb.yaim/config/defaults/glite-lb.pre @@ -4,8 +4,8 @@ # system settings # -#GLITE_LB_LOCATION='@glite_prefix@' -#GLITE_LB_LOCATION_ETC='@glite_etc@' +#GLITE_LOCATION='@glite_prefix@' +#GLITE_LOCATION_ETC='@glite_etc@' # query timeout #GLITE_WMS_QUERY_TIMEOUT=300 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 34b2c39..925a8a2 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb.in +++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in @@ -134,11 +134,11 @@ function config_glite_lb() { # config file lcas_libarch=lib if [ x`uname -m` = xx86_64 ]; then - if [ -f "$GLITE_LB_LOCATION/lib64/modules/lcas_lb.mod" ]; then + if [ -f "$GLITE_LOCATION/lib64/modules/lcas_lb.mod" ]; then lcas_libarch=lib64 fi fi - lcas_plugin="$GLITE_LB_LOCATION/$lcas_libarch/modules/lcas_lb.mod" + lcas_plugin="$GLITE_LOCATION/$lcas_libarch/modules/lcas_lb.mod" echo "pluginname=\"$lcas_plugin\"" > ${GLITE_LOCATION_ETC}/glite-lb/lcas.db # remove config file with defaults for yaim-less setup @@ -162,10 +162,10 @@ function config_glite_lb() { fi grep -v 'glite-lb-' @glite_etc@/gLiteservices 2>/dev/null > /tmp/gLiteservices mv /tmp/gLiteservices @glite_etc@/gLiteservices - echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd" >> @glite_etc@/gLiteservices - echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-locallogger" >> @glite_etc@/gLiteservices + echo "${GLITE_LOCATION_ETC}/init.d/glite-lb-bkserverd" >> @glite_etc@/gLiteservices + echo "${GLITE_LOCATION_ETC}/init.d/glite-lb-locallogger" >> @glite_etc@/gLiteservices if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then - echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-harvester" >> @glite_etc@/gLiteservices + echo "${GLITE_LOCATION_ETC}/init.d/glite-lb-harvester" >> @glite_etc@/gLiteservices fi # set mysql password -- 1.8.2.3