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

[bonivart at users.sourceforge.net]

Revision: 14373
          http://gar.svn.sourceforge.net/gar/?rev=14373&view=rev
Author:   bonivart
Date:     2011-04-21 17:15:46 +0000 (Thu, 21 Apr 2011)

Log Message:
-----------
cswclassutils/trunk: Update initsmf

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

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2011-04-21 07:38:14 UTC (rev 14372)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2011-04-21 17:15:46 UTC (rev 14373)
@@ -1,7 +1,7 @@
 # $HeadURL$
 
 NAME = cswclassutils
-VERSION = 1.43
+VERSION = 1.44
 CATEGORIES = utils
 
 # a few handy functions for defining 'generic' things dynamically

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes	2011-04-21 07:38:14 UTC (rev 14372)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcas-initsmf.cswreleasenotes	2011-04-21 17:15:46 UTC (rev 14373)
@@ -1,3 +1,4 @@
+* Read absolute state value instead of defaulting to enabled
 * Creating /etc/opt/csw/init.d so other packages relying on it aren't borked
   - mantis 4635
 * Override /usr/share warning as it's part of the doctype string

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2011-04-21 07:38:14 UTC (rev 14372)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2011-04-21 17:15:46 UTC (rev 14373)
@@ -22,6 +22,7 @@
 # 2009-08-05 Set new timeout values for manifest (Bug ID 0003764)
 # 2009-08-10 Fix autoenable bug (Bug ID 0003785)
 # 2010-10-25 Fix grep bug in FMRI 'dot in name' detection (Bug ID 0004588)
+# 2011-04-21 Read absolute state value instead of defaulting to enabled
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -32,14 +33,17 @@
 # retrieve the previous state of a service identified by the given FRMI
 load_smf_service_state ()
 {
-    SMF_STATE="enabled"
+  SMF_STATE=""
 
-    if [ -f "$SMF_STATE_FILE" ]; then
-        set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
-        if [ "$1" = "disabled" ]; then
-            SMF_STATE="disabled"
-        fi
+  if [ -f "$SMF_STATE_FILE" ]; then
+    set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
+    if [ "$1" = "disabled" ]; then
+      SMF_STATE="disabled"
     fi
+    if [ "$1" = "enabled" ]; then
+      SMF_STATE="enabled"
+    fi
+  fi
 }
 
 # Source csw.conf, if it exists


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