[gentoo-commits] dev/ultrabug:master commit in: sys-cluster/libccs-perl/, sys-cluster/libcman/, sys-cluster/libccs/, ... - gentoo-commits

From:	Alexys Jacob <ultrabug@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] dev/ultrabug:master commit in: sys-cluster/libccs-perl/, sys-cluster/libcman/, sys-cluster/libccs/, ...
Date:	Thu, 28 Jul 2011 14:57:46
Message-Id:	`de43fe2727fcc9fb67446a53fca0911f14f0de9c.ultrabug@gentoo`

1

commit:     de43fe2727fcc9fb67446a53fca0911f14f0de9c

2

Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>

3

AuthorDate: Thu Jul 28 14:57:16 2011 +0000

4

Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>

5

CommitDate: Thu Jul 28 14:57:16 2011 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=de43fe27

7

8

cman init.d work by David Guglielmi

9

10

---

11

 sys-cluster/cman/Manifest         |    6 +++-

12

 sys-cluster/cman/files/cman.initd |   49 +++++++++++++++++++++++-------------

13

 sys-cluster/libccs-perl/Manifest  |    2 +-

14

 sys-cluster/libccs/Manifest       |    2 +-

15

 sys-cluster/libcman/Manifest      |    2 +-

16

 sys-cluster/libdlm/Manifest       |    2 +-

17

 sys-cluster/libfence/Manifest     |    2 +-

18

 sys-cluster/liblogthread/Manifest |    2 +-

19

 sys-cluster/rgmanager/Manifest    |    2 +-

20

 sys-fs/gfs2-utils/Manifest        |    2 +-

21

 10 files changed, 43 insertions(+), 28 deletions(-)

22

23

diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest

24

index 831b106..01c5a65 100644

25

--- a/sys-cluster/cman/Manifest

26

+++ b/sys-cluster/cman/Manifest

27

@@ -1,5 +1,7 @@

28

-EBUILD cman-3.1.5.ebuild 2576 RMD160 e2aff7d047d6e374cc0b19e51786cd7eeedd0179 SHA1 4ec48e4507961b1c602ec25b093b0d8527d48bd5 SHA256 a41e58ed2a07ba516fa3bc1ced80387c4b8ec3e39df3e5d774bbc2994dda0f80

29

 AUX cman.confd 2797 RMD160 9c4bdb0b651e60f25a7338b9ddad4cd582d2cd92 SHA1 f811a83fb2f31882b787aa7d5b4adc61599e63b2 SHA256 45f89870420c0855ace5a27149db878bd592a2f48c35711b40d29f3b358a2bf5

30

-AUX cman.initd 6983 RMD160 e1efdd4630d62abd91973d8d7d094e00efd09c03 SHA1 f1af73b99e78912b6b9d6a8d35963492ea0f6017 SHA256 4399345d8690fb485feaf0e514c3cb3918563988732967fb1ad9ee07e1b96c97

31

+AUX cman.confd.ori 5044 RMD160 03fb12f4345f78d3a1954a6777bdf6dcb356315e SHA1 42db7eacfa922d4939b99d327ef7bd39f82236fb SHA256 7438c251ec074392fb302b7b6798ff9ecab41681d9d283b33aefd307b9f5a10a

32

+AUX cman.initd 7234 RMD160 56f6f6eb10d0a034c4eaf16a09f0cc4a5d9df79e SHA1 08caaee22b10b2b22ae696c4ff06fc66950e80c0 SHA256 709e1fc5c2088ff9821bd8dac7f052ffb2ed44bd744d5c9f3329e7e35701c0fb

33

+AUX cman.initd.ori 12471 RMD160 e787ba2db8de4b813a443cb709d213f42d6d537e SHA1 3826debc88f287921a1a19217c3952c54e375846 SHA256 a058154a6d87e4e7d85964b40dd8a57786e3f32352384ea093407af4856067d4

34

 AUX qdiskd.initd 588 RMD160 ce692384ae29823f0d6a9cc38e36b3a5481deeda SHA1 0918d79fcaa007cd8be4e9d3e5f87f8d0036c39d SHA256 7275f95a197484a339b3c3e4b0dd01998388e4a3fbd108f1b62d6b24b46ca94f

35

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

36

+EBUILD cman-3.1.5.ebuild 2576 RMD160 e2aff7d047d6e374cc0b19e51786cd7eeedd0179 SHA1 4ec48e4507961b1c602ec25b093b0d8527d48bd5 SHA256 a41e58ed2a07ba516fa3bc1ced80387c4b8ec3e39df3e5d774bbc2994dda0f80

37

38

diff --git a/sys-cluster/cman/files/cman.initd b/sys-cluster/cman/files/cman.initd

39

index ac282c0..d012b35 100644

40

--- a/sys-cluster/cman/files/cman.initd

41

+++ b/sys-cluster/cman/files/cman.initd

42

@@ -22,6 +22,7 @@ depend() {

43

 	use net

44

 	after xend

45

 	after xendomains

46

+	provide cman

47

}

48

49

 load_modules() {

50

@@ -194,8 +195,8 @@ stop_cman() {

51

 			#sleep 2

52

 			#${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \

53

 			#	leave remove ${CMAN_LEAVE_OPTS} > /dev/null

54

-			${CMAN_TOOL} -w -t 60 \

55

-				leave remove ${CMAN_LEAVE_OPTS} &> /dev/null

56

+			${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \

57

+				remove &> /dev/null

58

 				stat=$?

59

 				retry=$((${retry} -1))

60

 		done

61

@@ -226,10 +227,10 @@ start_fenced() {

62

 	ebegin "Joining fence domain"

63

 	if [ "${errmsg}" -ne 0 ]

64

 	then

65

-		${FENCE_TOOL} -w -t $FENCED_START_TIMEOUT join &> /dev/null

66

+		${FENCE_TOOL} join -t $FENCED_START_TIMEOUT &> /dev/null

67

 		[ $? -eq 0 ] && errmsg=$? || errmsg=1

68

 	else

69

-		${FENCE_TOOL} -w -m $FENCED_MEMBER_DELAY join &> /dev/null

70

+		${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY &> /dev/null

71

 		[ $? -eq 0 ] && errmsg=$? || errmsg=1

72

fi

73

 	eend $errmsg

74

@@ -237,18 +238,26 @@ start_fenced() {

75

76

 stop_fenced() {

77

 	# fenced services

78

-	local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')"

79

-	if [ -n "${fence_status}" ]; then

80

-		if [ -x ${FENCE_TOOL} ]; then

81

+#	local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')"

82

+#	if [ -n "${fence_status}" ]; then

83

+#		if [ -x ${FENCE_TOOL} ]; then

84

+#			ebegin "Leaving fence domain"

85

+#			${FENCE_TOOL} leave > /dev/null 2>&1

86

+#			eend $?

87

+#		fi

88

+#	fi

89

+

90

+	if [ -x ${FENCE_TOOL} ]; then

91

+		if ${FENCE_TOOL} ls >/dev/null 2>&1; then

92

 			ebegin "Leaving fence domain"

93

 			${FENCE_TOOL} leave > /dev/null 2>&1

94

 			eend $?

95

fi

96

fi

97

98

-	#ebegin "Stopping fenced"

99

-	#start-stop-daemon --stop --exec ${FENCED} --name fenced

100

-	#eend $?

101

+	ebegin "Stopping fenced"

102

+	start-stop-daemon --stop --exec ${FENCED} --name fenced

103

+	eend $?

104

}

105

106

 start_gfs_controld() {

107

@@ -276,23 +285,26 @@ stop_dlm_controld() {

108

}

109

110

 start() {

111

-	load_modules "dlm lock_dlm"

112

+	load_modules "dlm"

113

114

     mkdir -p /var/run/cluster

115

116

 	mount_configfs

117

-	start_ccsd

118

+#	start_ccsd

119

 	start_cman

120

-	start_groupd

121

 	start_fenced

122

+	start_groupd

123

 	start_dlm_controld

124

-	start_gfs_controld

125

+#	start_gfs_controld

126

}

127

128

 stop() {

129

-	# umount GFS filesystems

130

-	umount_gfs_filesystems

131

132

+# umount GFS filesystems

133

+#	umount_gfs_filesystems

134

+

135

+	stop_dlm_controld

136

+	stop_groupd

137

 	stop_fenced

138

 	stop_cman

139

140

@@ -300,7 +312,8 @@ stop() {

141

 	#stop_dlm_controld

142

 	#stop_groupd

143

144

-	stop_ccsd

145

-	unload_allmodules

146

+	unload_modules "dlm"

147

+#	stop_ccsd

148

+#	unload_allmodules

149

 	umount_configfs

150

}

151

152

diff --git a/sys-cluster/libccs-perl/Manifest b/sys-cluster/libccs-perl/Manifest

153

index 739ef79..97a910b 100644

154

--- a/sys-cluster/libccs-perl/Manifest

155

+++ b/sys-cluster/libccs-perl/Manifest

156

@@ -1,2 +1,2 @@

157

-EBUILD libccs-perl-3.1.5.ebuild 1141 RMD160 ccd29b4100a4d99ac29d8d2c9c9722b412bdab66 SHA1 36e47c877876762536e99c527856e5cf36329888 SHA256 ebb66f55ec50b9024856cb40717a7cdab01ddc8525d1462bb9fa878e31e2b7ba

158

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

159

+EBUILD libccs-perl-3.1.5.ebuild 1006 RMD160 3d7a2c1694549a2fb2695409c2069cf429fff950 SHA1 61216526f2c122da31dc616dc90dd25df105f9a0 SHA256 64e26f9778816a25b739255c4f9370dd990f1a33e422af29e502e7a7c4042442

160

161

diff --git a/sys-cluster/libccs/Manifest b/sys-cluster/libccs/Manifest

162

index f09aa69..b480bde 100644

163

--- a/sys-cluster/libccs/Manifest

164

+++ b/sys-cluster/libccs/Manifest

165

@@ -1,2 +1,2 @@

166

-EBUILD libccs-3.1.5.ebuild 1143 RMD160 fa381de00bcc45487b9b278819dc71363a61f418 SHA1 238e442d9aeae3094c7b3d81f6342662760672d3 SHA256 be45987826329f7e093fdc05ffdea61f22fdcaf76d12764e9a50654082181aca

167

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

168

+EBUILD libccs-3.1.5.ebuild 1143 RMD160 fa381de00bcc45487b9b278819dc71363a61f418 SHA1 238e442d9aeae3094c7b3d81f6342662760672d3 SHA256 be45987826329f7e093fdc05ffdea61f22fdcaf76d12764e9a50654082181aca

169

170

diff --git a/sys-cluster/libcman/Manifest b/sys-cluster/libcman/Manifest

171

index a85a6d9..e21c68a 100644

172

--- a/sys-cluster/libcman/Manifest

173

+++ b/sys-cluster/libcman/Manifest

174

@@ -1,2 +1,2 @@

175

-EBUILD libcman-3.1.5.ebuild 1076 RMD160 1cf524de412024352a58b937eba2682a551610dd SHA1 3c02b41f7b2165ad1a10497169a4053f5fe14f0a SHA256 e7da4decfb1f7f286e0afebf726c28ffc905e9be5544755a95ded9509d6e4014

176

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

177

+EBUILD libcman-3.1.5.ebuild 1076 RMD160 1cf524de412024352a58b937eba2682a551610dd SHA1 3c02b41f7b2165ad1a10497169a4053f5fe14f0a SHA256 e7da4decfb1f7f286e0afebf726c28ffc905e9be5544755a95ded9509d6e4014

178

179

diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest

180

index 9566ac4..669683a 100644

181

--- a/sys-cluster/libdlm/Manifest

182

+++ b/sys-cluster/libdlm/Manifest

183

@@ -1,2 +1,2 @@

184

-EBUILD libdlm-3.1.5.ebuild 1587 RMD160 4faa7112f6b53794498f3baec0d4cd75e4bc1212 SHA1 773224dd12d5124888ba16312091c065bf4f46d2 SHA256 167d9d0132ba09ca44571747f0520a95d3c9f7037ad6bdc835efe8acf865ea9a

185

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

186

+EBUILD libdlm-3.1.5.ebuild 1587 RMD160 4faa7112f6b53794498f3baec0d4cd75e4bc1212 SHA1 773224dd12d5124888ba16312091c065bf4f46d2 SHA256 167d9d0132ba09ca44571747f0520a95d3c9f7037ad6bdc835efe8acf865ea9a

187

188

diff --git a/sys-cluster/libfence/Manifest b/sys-cluster/libfence/Manifest

189

index 11ea169..3846f3d 100644

190

--- a/sys-cluster/libfence/Manifest

191

+++ b/sys-cluster/libfence/Manifest

192

@@ -1,2 +1,2 @@

193

-EBUILD libfence-3.1.5.ebuild 1372 RMD160 dce8d57fbf52fbfaa473cdc42774e0cfc4d28d8e SHA1 d841391705ad4dd0068999a15583fcd96bb40bb8 SHA256 b7aabf5bfaaa8de53904c17ab21c03d1913ab893f0b2335e2843a7ac360fc0f3

194

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

195

+EBUILD libfence-3.1.5.ebuild 1372 RMD160 dce8d57fbf52fbfaa473cdc42774e0cfc4d28d8e SHA1 d841391705ad4dd0068999a15583fcd96bb40bb8 SHA256 b7aabf5bfaaa8de53904c17ab21c03d1913ab893f0b2335e2843a7ac360fc0f3

196

197

diff --git a/sys-cluster/liblogthread/Manifest b/sys-cluster/liblogthread/Manifest

198

index 2669f70..c85d65f 100644

199

--- a/sys-cluster/liblogthread/Manifest

200

+++ b/sys-cluster/liblogthread/Manifest

201

@@ -1,2 +1,2 @@

202

-EBUILD liblogthread-3.1.5.ebuild 1074 RMD160 a2c8a71e785076dfd82ae659a49bc3b99cae3e02 SHA1 ca9a3b0ae472fd805c22bf267bffa83ad9d993b6 SHA256 8861f26e3ef0f28ed77a9e998bc98259fba0eae45cd9a690c74465f800906e75

203

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

204

+EBUILD liblogthread-3.1.5.ebuild 1074 RMD160 a2c8a71e785076dfd82ae659a49bc3b99cae3e02 SHA1 ca9a3b0ae472fd805c22bf267bffa83ad9d993b6 SHA256 8861f26e3ef0f28ed77a9e998bc98259fba0eae45cd9a690c74465f800906e75

205

206

diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest

207

index b741000..2139291 100644

208

--- a/sys-cluster/rgmanager/Manifest

209

+++ b/sys-cluster/rgmanager/Manifest

210

@@ -1,5 +1,5 @@

211

 AUX rgmanager-3.1.5-fix_libxml2.patch 731 RMD160 ba4eb0c6301abe1f408840fbfb14b45c337d3cbf SHA1 a7d56a71e72c7e0d433e84571701d5a374eb1bbe SHA256 b939dec463869b3b3c21b4a9dfad61f14eee57e0cd006e661387c408a0537ced

212

 AUX rgmanager.confd 280 RMD160 665f41ebef32eff3471795e706e479ecb87cace5 SHA1 18b7fe51b960e3a799764dc13da70d6cca39316b SHA256 6b76b80ebd41c3dd375e3e58f518f312af57746b906a41ad2f317eee17c67993

213

 AUX rgmanager.initd 754 RMD160 2a1e1fba0f376fe5f5ee31af80c106a950a1873e SHA1 c8d8a3c9f833ae56757b7837d670642bb17cd815 SHA256 856e388db67c525514c10eb6fa02283a7ac755cdfc609a9c613f978fc8faf634

214

-EBUILD rgmanager-3.1.5.ebuild 1552 RMD160 c5e2fb28e8ec2906c8ea7a75d17bb34c70819351 SHA1 298e65c9bf5dc17c2ebed7eb378aebf562fc8bbe SHA256 6218628b0aae9a179d0bcc3b3049928d3959c77ed763d2e07a5cb63e1b7f9c6c

215

 DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e

216

+EBUILD rgmanager-3.1.5.ebuild 1552 RMD160 c5e2fb28e8ec2906c8ea7a75d17bb34c70819351 SHA1 298e65c9bf5dc17c2ebed7eb378aebf562fc8bbe SHA256 6218628b0aae9a179d0bcc3b3049928d3959c77ed763d2e07a5cb63e1b7f9c6c

217

218

diff --git a/sys-fs/gfs2-utils/Manifest b/sys-fs/gfs2-utils/Manifest

219

index 29a00e4..ecaf293 100644

220

--- a/sys-fs/gfs2-utils/Manifest

221

+++ b/sys-fs/gfs2-utils/Manifest

222

@@ -1,2 +1,2 @@

223

-EBUILD gfs2-utils-3.1.2.ebuild 923 RMD160 0e48194f5cf84b93ac318a248314925c75eb9fa4 SHA1 f6953e968a9258dc409c7f472647b077ae7d7b3c SHA256 3aa79b1aaff535ea0be1da781eb2e512771766b0de0580b82f491a2909658241

224

 DIST gfs2-utils-3.1.2.tar.gz 348485 RMD160 730ab9868ce027605e24f6a1790daaf2e51e902c SHA1 139bf22a30f5a2adbc4b9d4757355601276544fb SHA256 34e3eabb0b95bcb4358268df6209af597688e7138161152b51d1c60b533d9fbd

225

+EBUILD gfs2-utils-3.1.2.ebuild 930 RMD160 32133bca5edeb01407e22dcead5cb21ab41db01e SHA1 ae57ce922e8835c25a1cdda2e7994c588637c20c SHA256 24eebe9a50e6a15c37adfc2452dfacc0e88c1f2b0bbfb819364f5a4984101baf

1	commit: de43fe2727fcc9fb67446a53fca0911f14f0de9c
2	Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3	AuthorDate: Thu Jul 28 14:57:16 2011 +0000
4	Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5	CommitDate: Thu Jul 28 14:57:16 2011 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=de43fe27
7
8	cman init.d work by David Guglielmi
9
10	---
11	sys-cluster/cman/Manifest \| 6 +++-
12	sys-cluster/cman/files/cman.initd \| 49 +++++++++++++++++++++++-------------
13	sys-cluster/libccs-perl/Manifest \| 2 +-
14	sys-cluster/libccs/Manifest \| 2 +-
15	sys-cluster/libcman/Manifest \| 2 +-
16	sys-cluster/libdlm/Manifest \| 2 +-
17	sys-cluster/libfence/Manifest \| 2 +-
18	sys-cluster/liblogthread/Manifest \| 2 +-
19	sys-cluster/rgmanager/Manifest \| 2 +-
20	sys-fs/gfs2-utils/Manifest \| 2 +-
21	10 files changed, 43 insertions(+), 28 deletions(-)
22
23	diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
24	index 831b106..01c5a65 100644
25	--- a/sys-cluster/cman/Manifest
26	+++ b/sys-cluster/cman/Manifest
27	@@ -1,5 +1,7 @@
28	-EBUILD cman-3.1.5.ebuild 2576 RMD160 e2aff7d047d6e374cc0b19e51786cd7eeedd0179 SHA1 4ec48e4507961b1c602ec25b093b0d8527d48bd5 SHA256 a41e58ed2a07ba516fa3bc1ced80387c4b8ec3e39df3e5d774bbc2994dda0f80
29	AUX cman.confd 2797 RMD160 9c4bdb0b651e60f25a7338b9ddad4cd582d2cd92 SHA1 f811a83fb2f31882b787aa7d5b4adc61599e63b2 SHA256 45f89870420c0855ace5a27149db878bd592a2f48c35711b40d29f3b358a2bf5
30	-AUX cman.initd 6983 RMD160 e1efdd4630d62abd91973d8d7d094e00efd09c03 SHA1 f1af73b99e78912b6b9d6a8d35963492ea0f6017 SHA256 4399345d8690fb485feaf0e514c3cb3918563988732967fb1ad9ee07e1b96c97
31	+AUX cman.confd.ori 5044 RMD160 03fb12f4345f78d3a1954a6777bdf6dcb356315e SHA1 42db7eacfa922d4939b99d327ef7bd39f82236fb SHA256 7438c251ec074392fb302b7b6798ff9ecab41681d9d283b33aefd307b9f5a10a
32	+AUX cman.initd 7234 RMD160 56f6f6eb10d0a034c4eaf16a09f0cc4a5d9df79e SHA1 08caaee22b10b2b22ae696c4ff06fc66950e80c0 SHA256 709e1fc5c2088ff9821bd8dac7f052ffb2ed44bd744d5c9f3329e7e35701c0fb
33	+AUX cman.initd.ori 12471 RMD160 e787ba2db8de4b813a443cb709d213f42d6d537e SHA1 3826debc88f287921a1a19217c3952c54e375846 SHA256 a058154a6d87e4e7d85964b40dd8a57786e3f32352384ea093407af4856067d4
34	AUX qdiskd.initd 588 RMD160 ce692384ae29823f0d6a9cc38e36b3a5481deeda SHA1 0918d79fcaa007cd8be4e9d3e5f87f8d0036c39d SHA256 7275f95a197484a339b3c3e4b0dd01998388e4a3fbd108f1b62d6b24b46ca94f
35	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
36	+EBUILD cman-3.1.5.ebuild 2576 RMD160 e2aff7d047d6e374cc0b19e51786cd7eeedd0179 SHA1 4ec48e4507961b1c602ec25b093b0d8527d48bd5 SHA256 a41e58ed2a07ba516fa3bc1ced80387c4b8ec3e39df3e5d774bbc2994dda0f80
37
38	diff --git a/sys-cluster/cman/files/cman.initd b/sys-cluster/cman/files/cman.initd
39	index ac282c0..d012b35 100644
40	--- a/sys-cluster/cman/files/cman.initd
41	+++ b/sys-cluster/cman/files/cman.initd
42	@@ -22,6 +22,7 @@ depend() {
43	use net
44	after xend
45	after xendomains
46	+ provide cman
47	}
48
49	load_modules() {
50	@@ -194,8 +195,8 @@ stop_cman() {
51	#sleep 2
52	#${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \
53	# leave remove ${CMAN_LEAVE_OPTS} > /dev/null
54	- ${CMAN_TOOL} -w -t 60 \
55	- leave remove ${CMAN_LEAVE_OPTS} &> /dev/null
56	+ ${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \
57	+ remove &> /dev/null
58	stat=$?
59	retry=$((${retry} -1))
60	done
61	@@ -226,10 +227,10 @@ start_fenced() {
62	ebegin "Joining fence domain"
63	if [ "${errmsg}" -ne 0 ]
64	then
65	- ${FENCE_TOOL} -w -t $FENCED_START_TIMEOUT join &> /dev/null
66	+ ${FENCE_TOOL} join -t $FENCED_START_TIMEOUT &> /dev/null
67	[ $? -eq 0 ] && errmsg=$? \|\| errmsg=1
68	else
69	- ${FENCE_TOOL} -w -m $FENCED_MEMBER_DELAY join &> /dev/null
70	+ ${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY &> /dev/null
71	[ $? -eq 0 ] && errmsg=$? \|\| errmsg=1
72	fi
73	eend $errmsg
74	@@ -237,18 +238,26 @@ start_fenced() {
75
76	stop_fenced() {
77	# fenced services
78	- local fence_status="$( ${CMAN_TOOL} services \| awk '$1 ~ /fence/ { print $3 }')"
79	- if [ -n "${fence_status}" ]; then
80	- if [ -x ${FENCE_TOOL} ]; then
81	+# local fence_status="$( ${CMAN_TOOL} services \| awk '$1 ~ /fence/ { print $3 }')"
82	+# if [ -n "${fence_status}" ]; then
83	+# if [ -x ${FENCE_TOOL} ]; then
84	+# ebegin "Leaving fence domain"
85	+# ${FENCE_TOOL} leave > /dev/null 2>&1
86	+# eend $?
87	+# fi
88	+# fi
89	+
90	+ if [ -x ${FENCE_TOOL} ]; then
91	+ if ${FENCE_TOOL} ls >/dev/null 2>&1; then
92	ebegin "Leaving fence domain"
93	${FENCE_TOOL} leave > /dev/null 2>&1
94	eend $?
95	fi
96	fi
97
98	- #ebegin "Stopping fenced"
99	- #start-stop-daemon --stop --exec ${FENCED} --name fenced
100	- #eend $?
101	+ ebegin "Stopping fenced"
102	+ start-stop-daemon --stop --exec ${FENCED} --name fenced
103	+ eend $?
104	}
105
106	start_gfs_controld() {
107	@@ -276,23 +285,26 @@ stop_dlm_controld() {
108	}
109
110	start() {
111	- load_modules "dlm lock_dlm"
112	+ load_modules "dlm"
113
114	mkdir -p /var/run/cluster
115
116	mount_configfs
117	- start_ccsd
118	+# start_ccsd
119	start_cman
120	- start_groupd
121	start_fenced
122	+ start_groupd
123	start_dlm_controld
124	- start_gfs_controld
125	+# start_gfs_controld
126	}
127
128	stop() {
129	- # umount GFS filesystems
130	- umount_gfs_filesystems
131
132	+# umount GFS filesystems
133	+# umount_gfs_filesystems
134	+
135	+ stop_dlm_controld
136	+ stop_groupd
137	stop_fenced
138	stop_cman
139
140	@@ -300,7 +312,8 @@ stop() {
141	#stop_dlm_controld
142	#stop_groupd
143
144	- stop_ccsd
145	- unload_allmodules
146	+ unload_modules "dlm"
147	+# stop_ccsd
148	+# unload_allmodules
149	umount_configfs
150	}
151
152	diff --git a/sys-cluster/libccs-perl/Manifest b/sys-cluster/libccs-perl/Manifest
153	index 739ef79..97a910b 100644
154	--- a/sys-cluster/libccs-perl/Manifest
155	+++ b/sys-cluster/libccs-perl/Manifest
156	@@ -1,2 +1,2 @@
157	-EBUILD libccs-perl-3.1.5.ebuild 1141 RMD160 ccd29b4100a4d99ac29d8d2c9c9722b412bdab66 SHA1 36e47c877876762536e99c527856e5cf36329888 SHA256 ebb66f55ec50b9024856cb40717a7cdab01ddc8525d1462bb9fa878e31e2b7ba
158	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
159	+EBUILD libccs-perl-3.1.5.ebuild 1006 RMD160 3d7a2c1694549a2fb2695409c2069cf429fff950 SHA1 61216526f2c122da31dc616dc90dd25df105f9a0 SHA256 64e26f9778816a25b739255c4f9370dd990f1a33e422af29e502e7a7c4042442
160
161	diff --git a/sys-cluster/libccs/Manifest b/sys-cluster/libccs/Manifest
162	index f09aa69..b480bde 100644
163	--- a/sys-cluster/libccs/Manifest
164	+++ b/sys-cluster/libccs/Manifest
165	@@ -1,2 +1,2 @@
166	-EBUILD libccs-3.1.5.ebuild 1143 RMD160 fa381de00bcc45487b9b278819dc71363a61f418 SHA1 238e442d9aeae3094c7b3d81f6342662760672d3 SHA256 be45987826329f7e093fdc05ffdea61f22fdcaf76d12764e9a50654082181aca
167	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
168	+EBUILD libccs-3.1.5.ebuild 1143 RMD160 fa381de00bcc45487b9b278819dc71363a61f418 SHA1 238e442d9aeae3094c7b3d81f6342662760672d3 SHA256 be45987826329f7e093fdc05ffdea61f22fdcaf76d12764e9a50654082181aca
169
170	diff --git a/sys-cluster/libcman/Manifest b/sys-cluster/libcman/Manifest
171	index a85a6d9..e21c68a 100644
172	--- a/sys-cluster/libcman/Manifest
173	+++ b/sys-cluster/libcman/Manifest
174	@@ -1,2 +1,2 @@
175	-EBUILD libcman-3.1.5.ebuild 1076 RMD160 1cf524de412024352a58b937eba2682a551610dd SHA1 3c02b41f7b2165ad1a10497169a4053f5fe14f0a SHA256 e7da4decfb1f7f286e0afebf726c28ffc905e9be5544755a95ded9509d6e4014
176	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
177	+EBUILD libcman-3.1.5.ebuild 1076 RMD160 1cf524de412024352a58b937eba2682a551610dd SHA1 3c02b41f7b2165ad1a10497169a4053f5fe14f0a SHA256 e7da4decfb1f7f286e0afebf726c28ffc905e9be5544755a95ded9509d6e4014
178
179	diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
180	index 9566ac4..669683a 100644
181	--- a/sys-cluster/libdlm/Manifest
182	+++ b/sys-cluster/libdlm/Manifest
183	@@ -1,2 +1,2 @@
184	-EBUILD libdlm-3.1.5.ebuild 1587 RMD160 4faa7112f6b53794498f3baec0d4cd75e4bc1212 SHA1 773224dd12d5124888ba16312091c065bf4f46d2 SHA256 167d9d0132ba09ca44571747f0520a95d3c9f7037ad6bdc835efe8acf865ea9a
185	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
186	+EBUILD libdlm-3.1.5.ebuild 1587 RMD160 4faa7112f6b53794498f3baec0d4cd75e4bc1212 SHA1 773224dd12d5124888ba16312091c065bf4f46d2 SHA256 167d9d0132ba09ca44571747f0520a95d3c9f7037ad6bdc835efe8acf865ea9a
187
188	diff --git a/sys-cluster/libfence/Manifest b/sys-cluster/libfence/Manifest
189	index 11ea169..3846f3d 100644
190	--- a/sys-cluster/libfence/Manifest
191	+++ b/sys-cluster/libfence/Manifest
192	@@ -1,2 +1,2 @@
193	-EBUILD libfence-3.1.5.ebuild 1372 RMD160 dce8d57fbf52fbfaa473cdc42774e0cfc4d28d8e SHA1 d841391705ad4dd0068999a15583fcd96bb40bb8 SHA256 b7aabf5bfaaa8de53904c17ab21c03d1913ab893f0b2335e2843a7ac360fc0f3
194	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
195	+EBUILD libfence-3.1.5.ebuild 1372 RMD160 dce8d57fbf52fbfaa473cdc42774e0cfc4d28d8e SHA1 d841391705ad4dd0068999a15583fcd96bb40bb8 SHA256 b7aabf5bfaaa8de53904c17ab21c03d1913ab893f0b2335e2843a7ac360fc0f3
196
197	diff --git a/sys-cluster/liblogthread/Manifest b/sys-cluster/liblogthread/Manifest
198	index 2669f70..c85d65f 100644
199	--- a/sys-cluster/liblogthread/Manifest
200	+++ b/sys-cluster/liblogthread/Manifest
201	@@ -1,2 +1,2 @@
202	-EBUILD liblogthread-3.1.5.ebuild 1074 RMD160 a2c8a71e785076dfd82ae659a49bc3b99cae3e02 SHA1 ca9a3b0ae472fd805c22bf267bffa83ad9d993b6 SHA256 8861f26e3ef0f28ed77a9e998bc98259fba0eae45cd9a690c74465f800906e75
203	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
204	+EBUILD liblogthread-3.1.5.ebuild 1074 RMD160 a2c8a71e785076dfd82ae659a49bc3b99cae3e02 SHA1 ca9a3b0ae472fd805c22bf267bffa83ad9d993b6 SHA256 8861f26e3ef0f28ed77a9e998bc98259fba0eae45cd9a690c74465f800906e75
205
206	diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
207	index b741000..2139291 100644
208	--- a/sys-cluster/rgmanager/Manifest
209	+++ b/sys-cluster/rgmanager/Manifest
210	@@ -1,5 +1,5 @@
211	AUX rgmanager-3.1.5-fix_libxml2.patch 731 RMD160 ba4eb0c6301abe1f408840fbfb14b45c337d3cbf SHA1 a7d56a71e72c7e0d433e84571701d5a374eb1bbe SHA256 b939dec463869b3b3c21b4a9dfad61f14eee57e0cd006e661387c408a0537ced
212	AUX rgmanager.confd 280 RMD160 665f41ebef32eff3471795e706e479ecb87cace5 SHA1 18b7fe51b960e3a799764dc13da70d6cca39316b SHA256 6b76b80ebd41c3dd375e3e58f518f312af57746b906a41ad2f317eee17c67993
213	AUX rgmanager.initd 754 RMD160 2a1e1fba0f376fe5f5ee31af80c106a950a1873e SHA1 c8d8a3c9f833ae56757b7837d670642bb17cd815 SHA256 856e388db67c525514c10eb6fa02283a7ac755cdfc609a9c613f978fc8faf634
214	-EBUILD rgmanager-3.1.5.ebuild 1552 RMD160 c5e2fb28e8ec2906c8ea7a75d17bb34c70819351 SHA1 298e65c9bf5dc17c2ebed7eb378aebf562fc8bbe SHA256 6218628b0aae9a179d0bcc3b3049928d3959c77ed763d2e07a5cb63e1b7f9c6c
215	DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
216	+EBUILD rgmanager-3.1.5.ebuild 1552 RMD160 c5e2fb28e8ec2906c8ea7a75d17bb34c70819351 SHA1 298e65c9bf5dc17c2ebed7eb378aebf562fc8bbe SHA256 6218628b0aae9a179d0bcc3b3049928d3959c77ed763d2e07a5cb63e1b7f9c6c
217
218	diff --git a/sys-fs/gfs2-utils/Manifest b/sys-fs/gfs2-utils/Manifest
219	index 29a00e4..ecaf293 100644
220	--- a/sys-fs/gfs2-utils/Manifest
221	+++ b/sys-fs/gfs2-utils/Manifest
222	@@ -1,2 +1,2 @@
223	-EBUILD gfs2-utils-3.1.2.ebuild 923 RMD160 0e48194f5cf84b93ac318a248314925c75eb9fa4 SHA1 f6953e968a9258dc409c7f472647b077ae7d7b3c SHA256 3aa79b1aaff535ea0be1da781eb2e512771766b0de0580b82f491a2909658241
224	DIST gfs2-utils-3.1.2.tar.gz 348485 RMD160 730ab9868ce027605e24f6a1790daaf2e51e902c SHA1 139bf22a30f5a2adbc4b9d4757355601276544fb SHA256 34e3eabb0b95bcb4358268df6209af597688e7138161152b51d1c60b533d9fbd
225	+EBUILD gfs2-utils-3.1.2.ebuild 930 RMD160 32133bca5edeb01407e22dcead5cb21ab41db01e SHA1 ae57ce922e8835c25a1cdda2e7994c588637c20c SHA256 24eebe9a50e6a15c37adfc2452dfacc0e88c1f2b0bbfb819364f5a4984101baf

Gentoo Archives: gentoo-commits