1 |
polynomial-c 13/10/29 13:54:28 |
2 |
|
3 |
Modified: samba4.initd-r1 |
4 |
Log: |
5 |
Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor improvements of the init scripts. Removed old (broken) ebuilds |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-fs/samba/files/4.1/samba4.initd-r1 |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: samba4.initd-r1 |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- samba4.initd-r1 5 Aug 2013 04:41:21 -0000 1.1 |
23 |
+++ samba4.initd-r1 29 Oct 2013 13:54:28 -0000 1.2 |
24 |
@@ -1,59 +1,56 @@ |
25 |
#!/sbin/runscript |
26 |
# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License, v2 or later |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.1 2013/08/05 04:41:21 patrick Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.2 2013/10/29 13:54:28 polynomial-c Exp $ |
30 |
|
31 |
extra_started_commands="reload" |
32 |
+piddir="/var/run" |
33 |
|
34 |
depend() { |
35 |
- after slapd |
36 |
- need net |
37 |
- use cupsd |
38 |
+ after slapd |
39 |
+ need net |
40 |
+ use cupsd |
41 |
} |
42 |
|
43 |
DAEMONNAME="${SVCNAME##samba.}" |
44 |
[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} |
45 |
|
46 |
signal_do() { |
47 |
- local signal="$1" |
48 |
- [ -z "${signal}" ] && return 0 |
49 |
+ local signal="$1" |
50 |
+ [ -z "${signal}" ] && return 0 |
51 |
|
52 |
- local result=0 last_result=0 daemon= cmd_exec= |
53 |
- for daemon in ${daemon_list} ; do |
54 |
- eval cmd_exec=\$${daemon}_${signal} |
55 |
- if [ -n "${cmd_exec}" ]; then |
56 |
- ebegin "${my_service_name} -> ${signal}: ${daemon}" |
57 |
- #echo ${cmd} '->' ${!cmd} |
58 |
- ${cmd_exec} > /dev/null |
59 |
- last_result=$? |
60 |
- eend ${last_result} |
61 |
- fi |
62 |
- result=$(( ${result} + ${last_result} )) |
63 |
- done |
64 |
- return ${result} |
65 |
-} |
66 |
- |
67 |
-mkdir_sambadirs() { |
68 |
- [ -d /var/run/samba ] || mkdir -p /var/run/samba |
69 |
+ local result=0 last_result=0 daemon= cmd_exec= |
70 |
+ for daemon in ${daemon_list} ; do |
71 |
+ eval cmd_exec=\$${daemon}_${signal} |
72 |
+ if [ -n "${cmd_exec}" ]; then |
73 |
+ ebegin "${my_service_name} -> ${signal}: ${daemon}" |
74 |
+ #echo ${cmd} '->' ${!cmd} |
75 |
+ ${cmd_exec} > /dev/null |
76 |
+ last_result=$? |
77 |
+ eend ${last_result} |
78 |
+ fi |
79 |
+ result=$(( ${result} + ${last_result} )) |
80 |
+ done |
81 |
+ return ${result} |
82 |
} |
83 |
|
84 |
start() { |
85 |
- ${my_service_PRE} |
86 |
- mkdir_sambadirs |
87 |
- signal_do start && return 0 |
88 |
- |
89 |
- eerror "Error: starting services (see system logs)" |
90 |
- signal_do stop |
91 |
- return 1 |
92 |
+ ${my_service_PRE} |
93 |
+ [ -d "${piddir}" ] || mkdir -p "${piddir}" |
94 |
+ signal_do start && return 0 |
95 |
+ |
96 |
+ eerror "Error: starting services (see system logs)" |
97 |
+ signal_do stop |
98 |
+ return 1 |
99 |
} |
100 |
stop() { |
101 |
- ${my_service_PRE} |
102 |
- if signal_do stop ; then |
103 |
- ${my_service_POST} |
104 |
- return 0 |
105 |
- fi |
106 |
+ ${my_service_PRE} |
107 |
+ if signal_do stop ; then |
108 |
+ ${my_service_POST} |
109 |
+ return 0 |
110 |
+ fi |
111 |
} |
112 |
reload() { |
113 |
- ${my_service_PRE} |
114 |
- signal_do reload |
115 |
+ ${my_service_PRE} |
116 |
+ signal_do reload |
117 |
} |