Hello community, here is the log from the commit of package drbd-utils for openSUSE:Factory checked in at 2020-09-07 21:35:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old) and /work/SRC/openSUSE:Factory/.drbd-utils.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils" Mon Sep 7 21:35:21 2020 rev:39 rq:832640 version:9.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2020-06-09 00:09:19.862284055 +0200 +++ /work/SRC/openSUSE:Factory/.drbd-utils.new.3399/drbd-utils.changes 2020-09-07 21:35:46.857392571 +0200 @@ -1,0 +2,6 @@ +Fri Sep 4 02:29:56 UTC 2020 - nick wang <[email protected]> + +- bsc#1176065, fail to get master id from cib xml in fence handler + Add patch crm-fence-peer-pacemaker2-issue2.patch + +------------------------------------------------------------------- New: ---- crm-fence-peer-pacemaker2-issue2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-utils.spec ++++++ --- /var/tmp/diff_new_pack.VieYb0/_old 2020-09-07 21:35:47.513392875 +0200 +++ /var/tmp/diff_new_pack.VieYb0/_new 2020-09-07 21:35:47.517392876 +0200 @@ -35,6 +35,7 @@ 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 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1 ++++++ crm-fence-peer-pacemaker2-issue2.patch ++++++ 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; /<primitive/,/<\/primitive/ { /<instance_attributes/,/<\/instance_attributes/ { diff -Naur drbd-utils-9.13.0.orig/scripts/crm-fence-peer.sh drbd-utils-9.13.0/scripts/crm-fence-peer.sh --- drbd-utils-9.13.0.orig/scripts/crm-fence-peer.sh 2020-09-04 15:47:07.865987423 +0800 +++ drbd-utils-9.13.0/scripts/crm-fence-peer.sh 2020-09-04 15:47:37.046018153 +0800 @@ -87,7 +87,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; /<primitive/,/<\/primitive/ { /<instance_attributes/,/<\/instance_attributes/ {
