diff --git a/crm-fence-peer-pacemaker2-issue2.patch b/crm-fence-peer-pacemaker2-issue2.patch new file mode 100644 index 0000000..50c0f68 --- /dev/null +++ b/crm-fence-peer-pacemaker2-issue2.patch @@ -0,0 +1,30 @@ +error msg when using fence-handler: +sed: -e expression #1, char 28: unknown command: `\' +WARNING drbd-fencing could not determine the master id of drbd resource xxx + +Either replace the '\\' to '\' or change back to the original "xxx"' +quotation could fix the error. +diff -Naur drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh +--- drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh 2020-09-04 15:47:07.865987423 +0800 ++++ drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh 2020-09-04 15:47:25.086005572 +0800 +@@ -214,7 +214,7 @@ + # or double check that it is in fact a promotable="true" clone... + # But in the real world, this is good enough. + : ${master_id=$(set +x; echo "$cib_xml" | +- sed -ne '/<\(clone\|master\) /,/<\\/\(clone\|master\)>/ { ++ sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ { + /<\(clone\|master\) / h; + // { ++ sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ { + /<\(clone\|master\) / h; + / + +- bsc#1176065, fail to get master id from cib xml in fence handler + Add patch crm-fence-peer-pacemaker2-issue2.patch + ------------------------------------------------------------------- Mon Jun 8 08:11:04 UTC 2020 - nick wang diff --git a/drbd-utils.spec b/drbd-utils.spec index aea4936..0b6d13e 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -35,6 +35,7 @@ Patch3: fence-after-pacemaker-down.patch Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch Patch5: move_fencing_from_disk_to_net_in_example.patch Patch6: link-error-setup_option.patch +Patch7: crm-fence-peer-pacemaker2-issue2.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -85,6 +86,7 @@ raid 1. It is a building block for setting up clusters. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1