From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 29 Mar 2012 15:20:55 +0000 (+0000)
Subject: Not set-up starting daemons during installation, configured during yaim stage.
X-Git-Tag: glite-jobid-api-c_R_2_1_2_1~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6ca2cf27e5d928df39337f71a743ee41bfba348e;p=jra1mw.git

Not set-up starting daemons during installation, configured during yaim stage.
---

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index d774883..73bab36 100644
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -63,6 +63,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add glite-lb-harvester
+if [ $1 -eq 1 ] ; then
+	/sbin/chkconfig glite-lb-harvester off
+fi
 
 
 %preun
diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 5f26927..46ce6e5 100644
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -74,6 +74,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add glite-lb-locallogger
+if [ $1 -eq 1 ] ; then
+	/sbin/chkconfig glite-lb-locallogger off
+fi
 
 
 %preun
diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 2a731ca..fee3dea 100644
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -91,6 +91,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add glite-lb-bkserverd
+if [ $1 -eq 1 ] ; then
+	/sbin/chkconfig glite-lb-bkserverd off
+fi
 
 
 %preun
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 7cf6b01..487276d 100644
--- a/org.glite.lb.yaim/config/functions/config_glite_lb.in
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in
@@ -333,8 +333,28 @@ EOF
   # 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
 
+  # start-up on boot
   . @glite_etc@/profile.d/grid-env.sh
+  if egrep -i "Debian|Ubuntu" /etc/issue >/dev/null; then
+    update-rc.d glite-lb-bkserverd defaults
+    update-rc.d glite-lb-locallogger defaults
+    if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then
+      update-rc.d glite-lb-harvester defaults
+    fi
+  else
+    /sbin/chkconfig glite-lb-bkserverd on
+    /sbin/chkconfig glite-lb-locallogger on
+    if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then
+      /sbin/chkconfig glite-lb-harvester on
+    fi
+  fi
+
   ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-bkserverd restart
+  if [ x"$GLITE_LB_RTM_ENABLED" = x"true" ]; then
+    ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-harvester restart
+  else
+    ${GLITE_LB_LOCATION_ETC}/init.d/glite-lb-harvester stop
+  fi
 
   if [ ! $? = 0 ] ; then
     yaimlog ABORT "Service glite-lb-bkserverd failed to start!"