de-fuzz drbd patch
With rpm version < 4.13, patch cmd will create .orig file for fuzzy patch in default. And this .orig file may lead to rpmbuild failure "error: Installed (but unpackaged) file(s) found:" Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Story: 2003917 Task: 26962 Change-Id: I9e75bb278e6de63e28b2a1692f03883e5a2e86de Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
parent
3fed9a53bc
commit
05170d50d8
@ -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
|
||||
|
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user