diff --git a/filesystem/drbd/drbd-tools/centos/patches/0001-skip_wait_con_int_on_simplex.patch b/filesystem/drbd/drbd-tools/centos/patches/0001-skip_wait_con_int_on_simplex.patch index 397c6c935..bb43fa4a2 100644 --- a/filesystem/drbd/drbd-tools/centos/patches/0001-skip_wait_con_int_on_simplex.patch +++ b/filesystem/drbd/drbd-tools/centos/patches/0001-skip_wait_con_int_on_simplex.patch @@ -1,10 +1,8 @@ ---- - scripts/drbd | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - +diff --git a/scripts/drbd b/scripts/drbd +index f45f258..7640097 100755 --- a/scripts/drbd +++ b/scripts/drbd -@@ -185,7 +185,10 @@ case "$1" in +@@ -160,7 +160,10 @@ case "$1" in done [ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat diff --git a/filesystem/drbd/drbd-tools/centos/patches/0002-drbd-conditional-crm-dependency.patch b/filesystem/drbd/drbd-tools/centos/patches/0002-drbd-conditional-crm-dependency.patch index 2ef12ec3b..f423dfcc4 100644 --- a/filesystem/drbd/drbd-tools/centos/patches/0002-drbd-conditional-crm-dependency.patch +++ b/filesystem/drbd/drbd-tools/centos/patches/0002-drbd-conditional-crm-dependency.patch @@ -1,10 +1,10 @@ -Index: drbd-8.3.11/scripts/drbd.ocf -=================================================================== ---- drbd-8.3.11.orig/scripts/drbd.ocf -+++ drbd-8.3.11/scripts/drbd.ocf -@@ -202,13 +202,17 @@ do_drbdadm() { +diff --git a/scripts/drbd.ocf b/scripts/drbd.ocf +index 2105209..0aa9702 100644 +--- a/scripts/drbd.ocf ++++ b/scripts/drbd.ocf +@@ -217,13 +217,17 @@ do_drbdadm() { } - + set_master_score() { - # Use quiet mode (-Q) to quench logging. Actual score updates - # will get logged by attrd anyway @@ -15,12 +15,12 @@ Index: drbd-8.3.11/scripts/drbd.ocf + do_cmd ${HA_SBIN_DIR}/crm_master -Q -l reboot -v $1 + fi } - + remove_master_score() { - do_cmd ${HA_SBIN_DIR}/crm_master -l reboot -D + if [ -x ${HA_SBIN_DIR}/crm_master ]; then + do_cmd ${HA_SBIN_DIR}/crm_master -l reboot -D + fi } - + _sh_status_process() {