packages: samba/smb.init - make lockname overridable

[glen]

Author: glen                         Date: Tue Mar 22 11:10:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make lockname overridable

---- Files affected:
packages/samba:
   smb.init (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/samba/smb.init
diff -u packages/samba/smb.init:1.25 packages/samba/smb.init:1.26
--- packages/samba/smb.init:1.25	Tue Mar 22 12:03:36 2011
+++ packages/samba/smb.init	Tue Mar 22 12:10:44 2011
@@ -19,6 +19,7 @@
 CFGFILE="/etc/samba/smb.conf"
 smbd_pidfile="/var/run/smbd.pid"
 nmbd_pidfile="/var/run/nmbd.pid"
+lockname=smb
 
 # Demon specified configuration.
 . /etc/sysconfig/samba
@@ -38,7 +39,7 @@
 
 start() {
 	# Check if the service is already running?
-	if [ -f /var/lock/subsys/smb ]; then
+	if [ -f /var/lock/subsys/$lockname ]; then
 		msg_already_running "Samba SMB/CIFS Server"
 		return
 	fi
@@ -50,13 +51,13 @@
 	daemon /usr/sbin/nmbd -D $CFGFILE
 	[ $RETVAL -eq 0 ] && RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
-		touch /var/lock/subsys/smb
+		touch /var/lock/subsys/$lockname
 	fi
 }
 
 stop() {
 	# Stop daemons.
-	if [ ! -f /var/lock/subsys/smb ]; then
+	if [ ! -f /var/lock/subsys/$lockname ]; then
 		msg_not_running "Samba SMB/CIFS Server"
 		return
 	fi
@@ -66,11 +67,11 @@
 
 	msg_stopping "Samba NetBIOS Name Server"
 	killproc --pidfile $nmbd_pidfile nmbd
-	rm -f /var/lock/subsys/smb >/dev/null 2>&1
+	rm -f /var/lock/subsys/$lockname >/dev/null 2>&1
 }
 
 reload() {
-	if [ ! -f /var/lock/subsys/smb ]; then
+	if [ ! -f /var/lock/subsys/$lockname ]; then
 		msg_not_running "Samba SMB/CIFS Server"
 		RETVAL=7
 		return
@@ -82,7 +83,7 @@
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/smb ]; then
+	if [ ! -f /var/lock/subsys/$lockname ]; then
 		msg_not_running "Samba SMB/CIFS Server"
 		RETVAL=$1
 		return
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/smb.init?r1=1.25&r2=1.26&f=u