packages: dhcp/dhcp6.init - fix lockfile

glen glen at pld-linux.org
Thu Nov 19 21:45:02 CET 2009


Author: glen                         Date: Thu Nov 19 20:45:02 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix lockfile

---- Files affected:
packages/dhcp:
   dhcp6.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/dhcp/dhcp6.init
diff -u packages/dhcp/dhcp6.init:1.7 packages/dhcp/dhcp6.init:1.8
--- packages/dhcp/dhcp6.init:1.7	Thu Nov 19 21:35:00 2009
+++ packages/dhcp/dhcp6.init	Thu Nov 19 21:44:56 2009
@@ -87,7 +87,7 @@
 
 start() {
 	# Check if the service is already running?
-	if [ -f /var/lock/subsys/dhcpd ]; then
+	if [ -f /var/lock/subsys/dhcpd6 ]; then
 		msg_already_running "DHCP IPv6 Server"
 		return
 	fi
@@ -96,22 +96,22 @@
 	msg_starting "DHCP IPv6 Server"
 	daemon /sbin/dhcpd -6 -pf /var/run/dhpcd6.pid -q $DHCPD_INTERFACES
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd6
 }
 
 stop() {
-	if [ ! -f /var/lock/subsys/dhcpd ]; then
+	if [ ! -f /var/lock/subsys/dhcpd6 ]; then
 		msg_not_running "DHCP IPv6 Server"
 		return
 	fi
 
 	msg_stopping "DHCP IPv6 Server"
 	killproc --pidfile /var/run/dhcpd6.pid dhcpd
-	rm -f /var/run/dhcpd6.pid /var/lock/subsys/dhcpd >/dev/null 2>&1
+	rm -f /var/run/dhcpd6.pid /var/lock/subsys/dhcpd6 >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/dhcpd ]; then
+	if [ ! -f /var/lock/subsys/dhcpd6 ]; then
 		msg_not_running "DHCP IPv6 Server"
 		RETVAL=$1
 		return
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp6.init?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list