[csw-devel] SF.net SVN: gar:[2914] csw/mgar/pkg/dhcp/trunk

[bonivart at users.sourceforge.net]

Revision: 2914
          http://gar.svn.sourceforge.net/gar/?rev=2914&view=rev
Author:   bonivart
Date:     2009-01-27 17:22:24 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
dhcp: fixed doc and init script

Modified Paths:
--------------
    csw/mgar/pkg/dhcp/trunk/Makefile
    csw/mgar/pkg/dhcp/trunk/checksums
    csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW
    csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2009-01-27 09:16:43 UTC (rev 2913)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2009-01-27 17:22:24 UTC (rev 2914)
@@ -34,7 +34,7 @@
 
 PKGFILES_CSWdhcpdevel = $(PKGFILES_DEVEL)
 
-ENABLE_CHECK = 0
+#ENABLE_CHECK = 0
 
 INSTALL_SCRIPTS = custom
 

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2009-01-27 09:16:43 UTC (rev 2913)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2009-01-27 17:22:24 UTC (rev 2914)
@@ -1,4 +1,3 @@
 1fffed2e8c3d67b111316d6a9b33db7a  download/dhcp-4.1.0.tar.gz
 688cb75529efcf37de7526cd4111eea9  download/CSWdhcp.gspec
-4c15df7a456274832321edd6c2c85ba4  download/CSWdhcp.preremove
 5d8f4f34a43f235e28db4da8ecb1837d  download/CSWdhcpdevel.gspec

Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW	2009-01-27 09:16:43 UTC (rev 2913)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW	2009-01-27 17:22:24 UTC (rev 2914)
@@ -9,9 +9,10 @@
 Installation
 ------------
 1. Modify the dhcpd.conf file in /etc/opt/csw.
-2. Start DHCP with "/etc/init.d/cswdhcp start".
+2. Start DHCP with "/etc/init.d/cswdhcpd start" or
+   with "svcadm enable cswdhcpd" if you use SMF.
 
-More info here: http://www.isc.org/products/DHCP/.
+More info here: http://www.isc.org/sw/dhcp/.
 
 
-bonivart/071024
+bonivart/090127

Modified: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd	2009-01-27 09:16:43 UTC (rev 2913)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd	2009-01-27 17:22:24 UTC (rev 2914)
@@ -1,18 +1,20 @@
 #!/sbin/sh
 
 # rc-script for CSW DHCP
-# Peter Bonivart, 2008-12-21
+# Peter Bonivart, 2009-01-27
 
 PID=/var/opt/csw/dhcp/dhcpd.pid
-#OPTIONS="-cf /opt/csw/etc/dhcpd.conf"  # use old location of conf file
+#CONF=/opt/csw/etc/dhcpd.conf  # use old location of conf file
+CONF=/etc/opt/csw/dhcpd.conf
+OPTIONS="-pf /var/opt/csw/dhcp/dhcpd.pid"
 
 ZONE= # used for initialization, do not change
 
 case "$1" in
   'start')
-    if [ -f /opt/csw/sbin/dhcpd -a -f /etc/opt/csw/dhcpd.conf ]; then
+    if [ -f /opt/csw/sbin/dhcpd -a -f $CONF ]; then
       echo 'Starting dhcp.'
-      /opt/csw/sbin/dhcpd $OPTIONS &
+      /opt/csw/sbin/dhcpd -cf $CONF $OPTIONS
     fi
     ;;
   'stop')


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