packages: samba/smb.init - add $CFGFILE support, PATH already set to sane b...

[glen]

Author: glen                         Date: Tue Mar 22 10:48:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add $CFGFILE support, PATH already set to sane by rc-script functions

---- Files affected:
packages/samba:
   smb.init (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/samba/smb.init
diff -u packages/samba/smb.init:1.22 packages/samba/smb.init:1.23
--- packages/samba/smb.init:1.22	Tue Oct 14 23:08:04 2008
+++ packages/samba/smb.init	Tue Mar 22 11:48:30 2011
@@ -9,14 +9,15 @@
 # processname:	nmbd
 # processname:	smbd
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 # Source networking configuration.
 . /etc/sysconfig/network
 
+# Set default config
+CFGFILE="/etc/samba/smb.conf"
+
 # Demon specified configuration.
 . /etc/sysconfig/samba
 
@@ -33,17 +34,14 @@
 TMPDIR="/tmp"; export TMPDIR
 unset TMP || :
 
-# Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
-
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/smb ]; then
 		msg_starting smbd
-		daemon /usr/sbin/smbd -D
+		daemon /usr/sbin/smbd -D -s $CFGFILE
 		RETVAL=$?
 		msg_starting nmbd
-		daemon /usr/sbin/nmbd -D
+		daemon /usr/sbin/nmbd -D $CFGFILE
 		[ $RETVAL -eq 0 ] && RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
 			touch /var/lock/subsys/smb
================================================================

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