05170d50d8
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>
17 lines
513 B
Diff
17 lines
513 B
Diff
diff --git a/scripts/drbd b/scripts/drbd
|
|
index f45f258..7640097 100755
|
|
--- a/scripts/drbd
|
|
+++ b/scripts/drbd
|
|
@@ -160,7 +160,10 @@ case "$1" in
|
|
done
|
|
|
|
[ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat
|
|
- $DRBDADM wait-con-int # User interruptible version of wait-connect all
|
|
+
|
|
+ if [ ! -e /etc/platform/simplex ] ; then # Skip if simplex
|
|
+ $DRBDADM wait-con-int # User interruptible version of wait-connect all
|
|
+ fi
|
|
|
|
$DRBDADM sh-b-pri all # Become primary if configured
|
|
log_end_msg 0
|