Update for latest EMI yaim-core.

diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile
index 1d19dbe..23c90e0 100644 (file)
--- a/org.glite.lb.yaim/Makefile
+++ b/org.glite.lb.yaim/Makefile
@@ -12,7 +12,7 @@ yaim_prefix=/opt/glite
 node_info=${top_srcdir}/config/node-info.d/glite-lb
 node_info_project=${top_srcdir}/config/node-info.d/${project}/glite-lb
 
-FILES=glite-lb.pre glite-lb
+FILES=glite-lb.pre glite-lb config_glite_lb
 
 all ${FILES}:
        if test -f "${node_info_project}"; then \
@@ -26,6 +26,8 @@ all ${FILES}:
        fi; \
        sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre
 
+       sed -e 's:@glite_etc@:${sysconfdir}:' $(top_srcdir)/config/functions/config_glite_lb.in > config_glite_lb
+
        # metapackage info
        echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE
        cp LICENSE COPYRIGHT
@@ -39,9 +41,10 @@ install: ${FILES}
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
        mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions
-       for c in gip_lb glite_lb info_service_lb ; do \
+       for c in gip_lb info_service_lb ; do \
                install -m 0644 $(top_srcdir)/config/functions/config_$$c ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions; \
        done
+       install -m 0644 config_glite_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions; \
        install -m 0644 glite-lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d
        install -m 0644 glite-lb.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults
        echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package)

diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb b/org.glite.lb.yaim/config/functions/config_glite_lb.in
similarity index 98%
rename from org.glite.lb.yaim/config/functions/config_glite_lb
rename to org.glite.lb.yaim/config/functions/config_glite_lb.in
index d0ecf42..8b0674d 100644 (file)
--- a/org.glite.lb.yaim/config/functions/config_glite_lb
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in
@@ -365,13 +365,13 @@ $logfile {
 EOF
 
   # Start services
-  if [ ! -f ${GLITE_LB_LOCATION_ETC}/gLiteservices ] ; then
-    touch ${GLITE_LB_LOCATION_ETC}/gLiteservices
+  if [ ! -f @glite_etc@/gLiteservices ] ; then
+    touch @glite_etc@/gLiteservices
   fi
 
-  grep glite-lb-bkserverd ${GLITE_LB_LOCATION_ETC}/gLiteservices > /dev/null
+  grep glite-lb-bkserverd @glite_etc@/gLiteservices > /dev/null
   if [ ! $? = 0 ] ; then
-    echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd" >> ${GLITE_LOCATION}/etc/gLiteservices
+    echo "${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd" >> @glite_etc@/gLiteservices
   fi
 
   if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then