diff -Nru lvm2-2.02.133/debian/changelog lvm2-2.02.133/debian/changelog --- lvm2-2.02.133/debian/changelog 2015-12-16 07:56:25.000000000 -0700 +++ lvm2-2.02.133/debian/changelog 2016-01-27 13:16:36.000000000 -0700 @@ -1,3 +1,13 @@ +lvm2 (2.02.133-1ubuntu4) xenial; 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 in Xenial. Change start/stop dependencies + to dlm instead of cman and openais since neither cman nor openais + are available. + + -- Billy Olsen Fri, 15 Jan 2016 16:06:19 -0700 + lvm2 (2.02.133-1ubuntu2) xenial; urgency=medium * Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This breaks diff -Nru lvm2-2.02.133/debian/clvm.init lvm2-2.02.133/debian/clvm.init --- lvm2-2.02.133/debian/clvm.init 2015-12-10 04:35:18.000000000 -0700 +++ lvm2-2.02.133/debian/clvm.init 2016-01-15 15:48:06.000000000 -0700 @@ -4,8 +4,8 @@ # Provides: clvm # Required-Start: lvm2 # Required-Stop: lvm2 -# Should-Start: cman corosync openais -# Should-Stop: cman corosync openais +# Should-Start: corosync dlm +# Should-Stop: corosync dlm # Default-Start: S # Default-Stop: 0 6 # Short-Description: start and stop the lvm cluster locking daemon @@ -32,8 +32,11 @@ exit 0 fi -if ! cman_tool status >/dev/null 2>&1; then - log_failure_msg "clvmd: cluster is not running. Aborting." +# 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