[csw-devel] SF.net SVN: gar:[5974] csw/mgar/pkg/cswclassutils/trunk

[bonivart at users.sourceforge.net]

Revision: 5974
          http://gar.svn.sourceforge.net/gar/?rev=5974&view=rev
Author:   bonivart
Date:     2009-08-10 15:10:14 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
cswclassutils: fix bugs 3764 and 3785

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-08-10 13:53:04 UTC (rev 5973)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-08-10 15:10:14 UTC (rev 5974)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.17
+GARVERSION = 1.18
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-08-10 13:53:04 UTC (rev 5973)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-08-10 15:10:14 UTC (rev 5974)
@@ -5,19 +5,22 @@
 # $Id$
 #
 # Original concept by Philip Brown
-# Written by Peter Bonivart
+# Written and maintained by Peter Bonivart
 #
 # 2008-04-21 First release
 # 2009-03-28 Added support for refresh
 # 2009-04-21 Do not create rc links unless enabled (Bug ID 0003633),
 #            Persistent state across upgrades (Bug ID 0003634)
 # 2009-04-22 Fix bug when starting packages with multiple services (Ihsan Dogan)
-# 2009-04-24 Temporarily disabled the "persistent state" code until it can be used
-#            per service, not just per package
-# 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
+# 2009-04-24 Temporarily disabled the "persistent state" code until it can be
+#            used per service, not just per package
+# 2009-05-28 Enabled persistent state code again after receiving patch
+#            from Yann.
 #            Support AUTOENABLE to force no start regardless of
 #            local csw.conf (Bug ID 0003635).
 #            Support custom manifests (Bug ID 0003636)
+# 2009-08-05 Set new timeout values for manifest (Bug ID 0003764)
+# 2009-08-10 Fix autoenable bug (Bug ID 0003785)
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -76,9 +79,10 @@
   if [ "$autoenable_daemons" = "no" ]; then
     daemon=no
   fi
-  if [ "$autoenable_$service" = "no" ]; then
+  eval autoenable_service="\$autoenable_$service"
+  if [ "$autoenable_service" = "no" ]; then
     daemon=no
-  elif [ "$autoenable_$service" = "yes" ]; then
+  elif [ "$autoenable_service" = "yes" ]; then
     daemon=yes
   fi
 
@@ -158,14 +162,14 @@
     type='method'
     name='start'
     exec='$SVCDIR/method/svc-$service start'
-    timeout_seconds='-1'>
+    timeout_seconds='120'>
   </exec_method>
 
   <exec_method
     type='method'
     name='stop'
     exec='$SVCDIR/method/svc-$service stop'
-    timeout_seconds='-1'>
+    timeout_seconds='60'>
   </exec_method>
 
 EOF
@@ -177,7 +181,7 @@
     type='method'
     name='restart'
     exec='$SVCDIR/method/svc-$service restart'
-    timeout_seconds='-1'>
+    timeout_seconds='180'>
   </exec_method>
 
 EOF
@@ -190,7 +194,7 @@
     type='method'
     name='refresh'
     exec='$SVCDIR/method/svc-$service refresh'
-    timeout_seconds='-1'>
+    timeout_seconds='60'>
   </exec_method>
 
 EOF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.