diff -Nru lvm2-2.02.98/debian/changelog lvm2-2.02.98/debian/changelog --- lvm2-2.02.98/debian/changelog 2013-12-13 02:52:23.000000000 -0700 +++ lvm2-2.02.98/debian/changelog 2016-01-27 13:30:43.000000000 -0700 @@ -1,3 +1,13 @@ +lvm2 (2.02.98-6ubuntu3) trusty; urgency=medium + + * Remove the init script dependency on cman_tool. (LP: #1089013) + - debian/clvm.init: check corosync cluster status since the cman + tooling isn't available. Change start/stop dependencies to dlm + instead of cman and openais since those packages are no longer + available. + + -- Billy Olsen Sat, 16 Jan 2016 21:49:55 -0700 + lvm2 (2.02.98-6ubuntu2) trusty; urgency=medium * Add enable-issue-discards.patch: Enable "issue_discards" option by default diff -Nru lvm2-2.02.98/debian/clvm.init lvm2-2.02.98/debian/clvm.init --- lvm2-2.02.98/debian/clvm.init 2013-09-16 02:31:33.000000000 -0700 +++ lvm2-2.02.98/debian/clvm.init 2016-01-16 21:49:52.000000000 -0700 @@ -32,9 +32,12 @@ exit 0 fi -if ! cman_tool status >/dev/null 2>&1; then - log_failure_msg "clvmd: cluster is not running. Aborting." - exit 0 +# Since the cluster service is not available, check the corosync +# service is up and running. The corosync service is used in +# conjunction with dlm to coordinate locking in clvm +if ! /usr/sbin/corosync-quorumtool -s >/dev/null 2>&1; then + log_failure_msg "clvmd: corosync is not running. Aborting." + exit 0 fi CLVMDTIMEOUT=20