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 @@
|
|||||||
---
|
diff --git a/scripts/drbd b/scripts/drbd
|
||||||
scripts/drbd | 5 ++++-
|
index f45f258..7640097 100755
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/scripts/drbd
|
--- a/scripts/drbd
|
||||||
+++ b/scripts/drbd
|
+++ b/scripts/drbd
|
||||||
@@ -185,7 +185,10 @@ case "$1" in
|
@@ -160,7 +160,10 @@ case "$1" in
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat
|
[ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: drbd-8.3.11/scripts/drbd.ocf
|
diff --git a/scripts/drbd.ocf b/scripts/drbd.ocf
|
||||||
===================================================================
|
index 2105209..0aa9702 100644
|
||||||
--- drbd-8.3.11.orig/scripts/drbd.ocf
|
--- a/scripts/drbd.ocf
|
||||||
+++ drbd-8.3.11/scripts/drbd.ocf
|
+++ b/scripts/drbd.ocf
|
||||||
@@ -202,13 +202,17 @@ do_drbdadm() {
|
@@ -217,13 +217,17 @@ do_drbdadm() {
|
||||||
}
|
}
|
||||||
|
|
||||||
set_master_score() {
|
set_master_score() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user