[csw-devel] SF.net SVN: gar:[9992] csw/mgar/pkg/policyd-weight/trunk

[bonivart at users.sourceforge.net]

Revision: 9992
          http://gar.svn.sourceforge.net/gar/?rev=9992&view=rev
Author:   bonivart
Date:     2010-05-26 14:56:48 +0000 (Wed, 26 May 2010)

Log Message:
-----------
policyd-weight: fix init script, provide sample conf only

Modified Paths:
--------------
    csw/mgar/pkg/policyd-weight/trunk/Makefile
    csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init

Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile
===================================================================
--- csw/mgar/pkg/policyd-weight/trunk/Makefile	2010-05-26 14:56:20 UTC (rev 9991)
+++ csw/mgar/pkg/policyd-weight/trunk/Makefile	2010-05-26 14:56:48 UTC (rev 9992)
@@ -36,7 +36,6 @@
 
 INITSMF = /opt/csw/etc/init.d/csw$(GARNAME)
 USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup
-SAMPLECONF  = /etc/opt/csw/policyd-weight.conf
 
 CHECKPKG_OVERRIDES += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns
@@ -48,7 +47,7 @@
 	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d
 	@ginstall -m 755 $(FILEDIR)/$(GARNAME).init $(DESTDIR)/opt/csw/etc/init.d/csw$(GARNAME)
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw
-	@ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/policyd-weight.conf
+	@ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)
 	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup
 	@ginstall -m 755 -d $(DESTDIR)$(sbindir)

Modified: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init
===================================================================
--- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init	2010-05-26 14:56:20 UTC (rev 9991)
+++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init	2010-05-26 14:56:48 UTC (rev 9992)
@@ -4,20 +4,20 @@
 #RC_SLEV 3
 
 # rc-script for CSWpolicyd-weight
-# Peter Bonivart, 2010-05-25
+# Peter Bonivart, 2010-05-26
 
 # Source SMF includes
 [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh
 
 SERVICE=policyd-weight
-PATH=$PATH:/usr/bin:/opt/csw/bin
+PATH=/opt/csw/bin:/opt/csw/sbin:/usr/bin:/usr/sbin
 
 ZONE= # used for initialization, do not change
 
 case "$1" in
   start)
         echo "Starting $SERVICE ..."
-        [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf || /opt/csw/sbin/policyd-weight
+        [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf start || /opt/csw/sbin/policyd-weight start
         ;;
   stop)
         echo "Stopping $SERVICE ..."


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