[packages/samba] fix pidfile location in smb initscript

glen glen at pld-linux.org
Thu Apr 16 11:23:09 CEST 2015


commit 83f3f4f5c1debda0718d43af054193eead3d1da3
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Apr 16 12:20:01 2015 +0300

    fix pidfile location in smb initscript

 samba.init   | 0
 smb.init     | 8 ++++----
 winbind.init | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/samba.init b/samba.init
old mode 100644
new mode 100755
diff --git a/smb.init b/smb.init
old mode 100644
new mode 100755
index 541d581..a605f49
--- a/smb.init
+++ b/smb.init
@@ -17,8 +17,8 @@
 
 # Set default config
 CFGFILE="/etc/samba/smb.conf"
-smbd_pidfile="/var/run/smbd.pid"
-nmbd_pidfile="/var/run/nmbd.pid"
+smbd_pidfile="/var/run/samba/smbd.pid"
+nmbd_pidfile="/var/run/samba/nmbd.pid"
 lockname=smb
 
 # Demon specified configuration.
@@ -34,10 +34,10 @@ else
 	exit 0
 fi
 
-TMPDIR="/tmp"; export TMPDIR
+export TMPDIR=/tmp
 unset TMP || :
 
-SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+SERVER_ROLE=$(samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -n1)
 if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
 	exit 0
 fi
diff --git a/winbind.init b/winbind.init
old mode 100644
new mode 100755
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/f651f6249ee9f67da110824c56787fa3b84fa03d



More information about the pld-cvs-commit mailing list