diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-12-11 23:54:24 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-12-11 23:54:24 +0000 |
| commit | e891556c30f226f1cb0334ec64d783eaa42eb021 (patch) | |
| tree | fb4648dc483898b704a6894482cc8e3b36840bbc /sys-cluster | |
| parent | Update LICENSE, see README and LICENSE files in tarball. (diff) | |
| download | gentoo-2-e891556c30f226f1cb0334ec64d783eaa42eb021.tar.gz gentoo-2-e891556c30f226f1cb0334ec64d783eaa42eb021.tar.bz2 gentoo-2-e891556c30f226f1cb0334ec64d783eaa42eb021.zip | |
Even more checking of cman init.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/cman/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/cman/files/cman.initd-3.1.5-r1 | 27 |
2 files changed, 25 insertions, 7 deletions
diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog index f3a61d7b2d09..35347cef68a3 100644 --- a/sys-cluster/cman/ChangeLog +++ b/sys-cluster/cman/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/cman # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.49 2012/12/11 22:16:13 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.50 2012/12/11 23:54:24 robbat2 Exp $ + + 11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> files/cman.initd-3.1.5-r1: + Even more checking of cman init. *cman-3.1.5-r1 (11 Dec 2012) diff --git a/sys-cluster/cman/files/cman.initd-3.1.5-r1 b/sys-cluster/cman/files/cman.initd-3.1.5-r1 index 91fee3427eab..c2e686e62973 100644 --- a/sys-cluster/cman/files/cman.initd-3.1.5-r1 +++ b/sys-cluster/cman/files/cman.initd-3.1.5-r1 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman.initd-3.1.5-r1,v 1.1 2012/12/11 22:16:13 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman.initd-3.1.5-r1,v 1.2 2012/12/11 23:54:24 robbat2 Exp $ CMAN_TOOL="/usr/sbin/cman_tool" FENCE_TOOL="/usr/sbin/fence_tool" @@ -176,6 +176,7 @@ start_cman() { if [ "$?" -ne 0 ] then eend 1 "Failed to start cman" + return 1 else eend 0 @@ -184,7 +185,9 @@ start_cman() { then ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)" ${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait - eend $? + rc=$? + eend $rc + return $rc fi fi else @@ -307,10 +310,22 @@ start() { mkdir -p /var/run/cluster # start_ccsd - start_cman - start_fenced - start_groupd - start_dlm_controld + if ! start_cman ; then + eerror "Failed to start cman" + return 1 + fi + if ! start_fenced; then + eerror "Failed to start fenced" + return 1 + fi + if ! start_groupd; then + eerror "Failed to start groupd" + return 1 + fi + if ! start_dlm_controld; then + eerror "Failed to start dlm_controld" + return 1 + fi # start_gfs_controld } |