diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-12-11 23:54:29 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-12-11 23:54:29 +0000 |
| commit | 49d8c47b9c3e163bebb36eb8e393ebb55dbad34d (patch) | |
| tree | 3638f950314890c4659b8f3ec2ed8685e508fe82 | |
| parent | Update LICENSE, see README and LICENSE files in tarball. (diff) | |
| download | historical-49d8c47b9c3e163bebb36eb8e393ebb55dbad34d.tar.gz historical-49d8c47b9c3e163bebb36eb8e393ebb55dbad34d.tar.bz2 historical-49d8c47b9c3e163bebb36eb8e393ebb55dbad34d.zip | |
Even more checking of cman init.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
| -rw-r--r-- | sys-cluster/cman/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-cluster/cman/Manifest | 4 | ||||
| -rw-r--r-- | sys-cluster/cman/files/cman.initd-3.1.5-r1 | 27 |
3 files changed, 27 insertions, 9 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/Manifest b/sys-cluster/cman/Manifest index 0ec4d272458a..ad4ed0b132fd 100644 --- a/sys-cluster/cman/Manifest +++ b/sys-cluster/cman/Manifest @@ -1,9 +1,9 @@ AUX cman.confd 2797 SHA256 45f89870420c0855ace5a27149db878bd592a2f48c35711b40d29f3b358a2bf5 SHA512 97cfe35230198091261ab3202c2c4eb2683f43ae311c07a6d34d9ae9c47c71c004ce615993ad25189ee536cbf2863fb721a57c520b439de2e70a7cd3d84ae3fe WHIRLPOOL cf34d8d3e7f2d6c1bfa367ab8f1c969e21e255febc9bbc7418be3662dd82264bd0fd64866db0885794c05bf2f1b52db7af97903ffbf79cb040422d85ca601ea3 AUX cman.initd 7224 SHA256 c127d11d6f0655fbefe3de95ee3dac749081336fe93cb30b0cd975a0f1e0a0cd SHA512 3f55d0ac6a383edc0f0a9029b07372b7480e7df82d7a5a16f547527bfad54823d351100d687f8788bee70676f989ae41b81715699978126c42fe9866f1116e2a WHIRLPOOL a065384385bd9ba00273d07e6bb882184387669f2e7a59b3e98a7aed80277f71870ab2b05fc91694ece15d6f2d6f871718acd7397d273bbb667aaab9f221a147 -AUX cman.initd-3.1.5-r1 7686 SHA256 0a4cecf91fbf66542aafe4bc51a773763185aa6e0744b0a819c183303529acc6 SHA512 19f21651875540b02f1823abac24a605effe70681e08cb8653b77fe47dfca6f0bd082e73545399e3d76ffcf143b894a63d1bc969b1a9a4a67b411083e572456a WHIRLPOOL 0fef899eb1a37251651b0eebb3c12a087a631f1d9a7a91e89c5334c7276a3eb60649bba80f62b757d10bb6fdda863cea74fb493d2b1694fe47f134095c9c9580 +AUX cman.initd-3.1.5-r1 7977 SHA256 419a6d6683d6e8c59ab98214f701ab6aa85fbc9824f9a52426ff0660753dec83 SHA512 36230df5ee7d94ff3ae17faf89f9e65f476e705a448aa3647fa92c9a2e41c2813faba72969caf42b9fa8e8ca95417186ee65295e2e9355c22928f3f0f72c12d1 WHIRLPOOL e3da30dc1e3d750e28e04ee74d1492a7fd700c2bfca93a61e55806af547a901b0ee31ae293124cf5daafdeaee6242ad522db125c9dffa50abd8f8cfd51661f16 AUX qdiskd.initd 578 SHA256 a680d858226b878bef90f76b4d1b772a2bf2b98be643a8633979e990b2f213cf SHA512 dacf2e4d96299b31f249276261885bc188755f9cebd186a39f67e4096486437cce05f16523b745a9875b71ad6111eceb979baf91261ea0be89746669a23adae8 WHIRLPOOL cad1b8a771193efb6b1de9b6fc1e96b4d44755fcf4f80e67a1854fb4701e9ea487005264804c0304d8736765414fce46640910854906ac0739d11b9c7921b5d5 DIST cluster-3.1.5.tar.gz 651449 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e EBUILD cman-3.1.5-r1.ebuild 2706 SHA256 5acce6276b2ced0afc387e022f722c594d0423cfbcb3e43b598adffde07f2af1 SHA512 d0c500d992ad1cd7f9e70652e96955c11504624c4639725054a862ab2c6cba704a5e33dece2ea1e98e19e6740c2e9e070d4f278573f801e5de252446cc1367ff WHIRLPOOL 60376b4ab7b091548ada906a486b653ac4cfdee28add8bf3ecace6c48e65b02acbd0d4ddf9bd8e5c217e0c6e8cc60b0aa9a4496532e9a9d638aa5c26157e2846 EBUILD cman-3.1.5.ebuild 2690 SHA256 9d861c07635ac8a61f277a6b52f50cbf1acd2344e266b6c57c94164f091b3b36 SHA512 2412e9a4705ab56de3d104192fd2b5b798a85590abb1168b239a8dcd8e1e534125d9c1b7674d791dd832077d0e3dd529c7410fe194b1aa3a8caa2c4a141e1112 WHIRLPOOL 98183ed3a6c9a2606b5f9b94aff695ba1d94e7c2f87d3143c51430ff1462fc4f2f3545ce48f43acf0b4473e2784b8252f96cf018e7bdf13f1c9fdb7e5da17a60 -MISC ChangeLog 828 SHA256 3731bb2efb802641e92def23df7190204946c29285064d0476f7371386e9783a SHA512 2e143664ec6cab0a0a58c865b4dd15c057f336c97e8f1333cba8dff4f1a2badaf4b4578f2bd565f7cdd1597d974768dc8a3975b6b5f6c08cc1e369757c71da7b WHIRLPOOL 6c0a761768ef9833a66d7af9e1a8a49bbb02db9991827a48fda70cc933c75af40704d9b17ce39b07763af61a21d67458811bf2c97d93eaf4f2e44c01fef5fe8e +MISC ChangeLog 944 SHA256 c40b57cc3233a2faab2c72f2741afca51af96c3f8f500e60b07456a782b0aa3d SHA512 b12763eacf232a9f1abde5c1787c97c46ffaeb02987dd52fd5143f76083c4f50dacc6f8a7c23a760676b0a46be03020f654033f5d052d8323db8c1608706762c WHIRLPOOL 3a62852450a9502d34fcf68e3904b971bccd327fc6b6115fbf540f20e3d0fd22844873689892bb16aaa86ccb5478ece158ef08e7870f15e9a8dfa6c7182d181b MISC metadata.xml 213 SHA256 69aa7f6654842583718e3cc6d05b1e7c3be2ec10baa05e6c5d6bddb040dbea2f SHA512 d8428d1102d2cc160c6a6b52f723276631c27285afb662c698c1f782c307bc1fdb722327eb252b1b42835990a964acb066f1b87243679eb506021de71ab002aa WHIRLPOOL 8abb0a6d9b1c5403a1a2a0d15d0bcec2ddae928a9dad65669a698420e5618014b678a33e96375d3981130c722d6a1165a91aa385b5b85bae97be1cd4458b7fa9 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 } |