[gentoo-commits] gentoo-x86 commit in net-fs/samba/files/4.0: samba4.initd-r1

[Lars Wendler (polynomial-c)]

polynomial-c    13/10/29 13:54:28

  Modified:             samba4.initd-r1
  Log:
  Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor improvements of the init scripts. Removed old (broken) ebuilds
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.2                  net-fs/samba/files/4.0/samba4.initd-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1?r1=1.1&r2=1.2

Index: samba4.initd-r1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba4.initd-r1	24 Nov 2012 23:59:23 -0000	1.1
+++ samba4.initd-r1	29 Oct 2013 13:54:28 -0000	1.2
@@ -1,59 +1,56 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v 1.2 2013/10/29 13:54:28 polynomial-c Exp $
 
 extra_started_commands="reload"
+piddir="/var/run"
 
 depend() {
-        after slapd
-        need net
-        use cupsd
+	after slapd
+	need net
+	use cupsd
 }
 
 DAEMONNAME="${SVCNAME##samba.}"
 [ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
 
 signal_do() {
-        local signal="$1"
-        [ -z "${signal}" ] && return 0
+	local signal="$1"
+	[ -z "${signal}" ] && return 0
 
-        local result=0 last_result=0 daemon= cmd_exec=
-        for daemon in ${daemon_list} ; do
-                eval cmd_exec=\$${daemon}_${signal}
-                if [ -n "${cmd_exec}" ]; then
-                        ebegin "${my_service_name} -> ${signal}: ${daemon}"
-                        #echo ${cmd} '->' ${!cmd}
-                        ${cmd_exec} > /dev/null
-                        last_result=$?
-                        eend ${last_result}
-                fi
-                result=$(( ${result} + ${last_result} ))
-        done
-        return ${result}
-}
-
-mkdir_sambadirs() {
-        [ -d /var/run/samba ] || mkdir -p /var/run/samba
+	local result=0 last_result=0 daemon= cmd_exec=
+	for daemon in ${daemon_list} ; do
+		eval cmd_exec=\$${daemon}_${signal}
+		if [ -n "${cmd_exec}" ]; then
+			ebegin "${my_service_name} -> ${signal}: ${daemon}"
+			#echo ${cmd} '->' ${!cmd}
+			${cmd_exec} > /dev/null
+			last_result=$?
+			eend ${last_result}
+		fi
+		result=$(( ${result} + ${last_result} ))
+	done
+	return ${result}
 }
 
 start() {
-        ${my_service_PRE}
-        mkdir_sambadirs
-        signal_do start && return 0
-
-        eerror "Error: starting services (see system logs)"
-        signal_do stop
-        return 1
+	${my_service_PRE}
+	[ -d "${piddir}" ] || mkdir -p "${piddir}"
+	signal_do start && return 0
+
+	eerror "Error: starting services (see system logs)"
+	signal_do stop
+	return 1
 }
 stop() {
-        ${my_service_PRE}
-        if signal_do stop ; then
-            ${my_service_POST}
-            return 0
-        fi
+	${my_service_PRE}
+	if signal_do stop ; then
+		${my_service_POST}
+		return 0
+	fi
 }
 reload() {
-        ${my_service_PRE}
-        signal_do reload
+	${my_service_PRE}
+	signal_do reload
 }