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

[bdwalton at users.sourceforge.net]

Revision: 6849
          http://gar.svn.sourceforge.net/gar/?rev=6849&view=rev
Author:   bdwalton
Date:     2009-10-13 13:10:36 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
cswclassutils: use /etc/{inetd.conf,services} instead of files in /etc/inet to have better effect on opensolaris

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices	2009-10-13 13:02:15 UTC (rev 6848)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcservices	2009-10-13 13:10:36 UTC (rev 6849)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # i.cswetcservices - Class action script
-# 		     for CSW /etc/inet/services registrations
+# 		     for CSW /etc/services registrations
 #
 # Written and maintained by Ben Walton
 #
@@ -17,7 +17,7 @@
   echo $dest
   /usr/bin/cp $src $dest || exit 2
 
-  svcfile=/etc/inet/services
+  svcfile=/etc/services
 
   /usr/xpg4/bin/grep -v "^#" $dest | while read svc; do
       set -- $svc
@@ -28,7 +28,6 @@
 	  echo "svcname: $svcname; port/proto: $port_proto"
       fi
 
-
       /usr/xpg4/bin/grep -q "^$svcname[[:space:]].*$port_proto.*$PKGINST" $svcfile
       if [ $? -ne 0 ]; then
 	  echo "$svcname		$port_proto	# $PKGINST" >> $svcfile

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2009-10-13 13:02:15 UTC (rev 6848)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinetd	2009-10-13 13:10:36 UTC (rev 6849)
@@ -58,7 +58,7 @@
 
   # we won't register with inetd if the service name isn't registered
   # in the global services file.
-  /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/inet/services
+  /usr/xpg4/bin/grep -q "^$svcname[[:space:]]" /etc/services
   if [ $? -eq 0 ]; then
       if [ -n "$DEBUG" ]; then
 	  echo "Installing inetd service:"
@@ -92,7 +92,7 @@
       else
 	  [ -n "$DEBUG" ] && echo "For solaris 8 or 9"
 
-	  inetdconf=$PKG_INSTALL_ROOT/etc/inet/inetd.conf
+	  inetdconf=$PKG_INSTALL_ROOT/etc/inetd.conf
 
 	  echo "Installing '$svcname' into inetd.conf."
 	  echo "# $PKGINST: added by i.cswinetd" >> $inetdconf


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