integ/filesystem/drbd/drbd-tools/centos/patches/0002-drbd-conditional-crm-dependency.patch
Scott Little 18f91ec6be Relocate drbd-tools to stx-integ/filesystem/drbd/drbd-tools
Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: Ibf3a0fc29dc2e6a0eeb02c98ff053bdb0443a9f0
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 15:31:55 -04:00

27 lines
801 B
Diff

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() {
}
set_master_score() {
- # Use quiet mode (-Q) to quench logging. Actual score updates
- # will get logged by attrd anyway
- do_cmd ${HA_SBIN_DIR}/crm_master -Q -l reboot -v $1
+ if [ -x ${HA_SBIN_DIR}/crm_master ]; then
+ # Use quiet mode (-Q) to quench logging. Actual score updates
+ # will get logged by attrd anyway
+ 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() {