From 20fd2154a0fe88c548da0435c602c6d2ffed5b25602c1e7d538c897f88193b8d Mon Sep 17 00:00:00 2001 From: nick wang Date: Thu, 28 Dec 2017 09:53:12 +0000 Subject: [PATCH] Accepting request 560262 from network:ha-clustering:Stable Update the bug number. OBS-URL: https://build.opensuse.org/request/show/560262 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=51 --- Update-block-drbd-script-to-support-xen.patch | 63 ------------------- _service | 7 ++- drbd-utils-9.0.0.tar.gz | 3 - drbd-utils-9.2.0.tar.gz | 3 + drbd-utils.changes | 31 +++++++++ drbd-utils.spec | 14 ++--- 6 files changed, 45 insertions(+), 76 deletions(-) delete mode 100644 Update-block-drbd-script-to-support-xen.patch delete mode 100644 drbd-utils-9.0.0.tar.gz create mode 100644 drbd-utils-9.2.0.tar.gz diff --git a/Update-block-drbd-script-to-support-xen.patch b/Update-block-drbd-script-to-support-xen.patch deleted file mode 100644 index 6c49523..0000000 --- a/Update-block-drbd-script-to-support-xen.patch +++ /dev/null @@ -1,63 +0,0 @@ -The xm/xend toolstack has long been removed from Xen and replaced -with xl/libxl. The legacy xmdomain.cfg(5) configuration format is -still supported for backward compatibility, but xl.cfg(5) format -is preferred. Update the script documenation to reflect this. - -When the legacy format is used, libxl places the entire target -string in $XENBUS_PATH/params, e.g. 'drbd:myresource'. To ensure -the script continues to work with the legacy configuration format, -strip any 'drbd:' prefix from the resource identifier read from -xenstore. - -Signed-off-by: Jim Fehlig -Signed-off-by: Nick Wang - ---- -diff -Naur drbd-utils-9.0.0.orig/scripts/block-drbd drbd-utils-9.0.0/scripts/block-drbd ---- drbd-utils-9.0.0.orig/scripts/block-drbd 2017-08-11 14:04:56.456929623 +0800 -+++ drbd-utils-9.0.0/scripts/block-drbd 2017-08-11 14:06:50.625342048 +0800 -@@ -5,12 +5,16 @@ - # - # This script implements the "drbd" VBD type. To use a DRBD resource - # as a virtual block device, include a line similar to this in your --# domU configuration: -+# domain xl.cfg(5) configuration: - # --# disk = [ 'drbd:myresource,xvda1,w' ] -+# disk = [ "vdev=vda,access=rw,script=block-drbd,target=myresource" ] -+# -+# The legacy xmdomain.cfg(5) configuration format is also supported -+# -+# disk = [ 'drbd:myresource,xvda,w' ] - # - # This will direct Xen to put the DRBD resource named 'myresource' --# into the Primary role, and configure it as device xvda1 in your -+# into the Primary role, and configure it as device xvda in your - # domU. You may use as many DRBD resources as you like. If you are - # using DRBD in dual-Primary mode (available in DRBD versions 8.0 and - # up), your DRBD-backed domU will be live migration capable. -@@ -34,7 +38,6 @@ - # made available read-only to multiple domU's, or be mounted - # read-only in the dom0 and be made available read-only to - # domU's. This is not supported by the 'drbd' VBD type. --# - Tested, thus far, only on Debian etch with Xen 3.0.3. - # - # For more information about DRBD, visit http://www.drbd.org/. - # -@@ -246,6 +249,7 @@ - if [ -n "$t" ] - then - p=$(xenstore_read "$XENBUS_PATH/params") -+ p=${p#drbd:} - mode=$(xenstore_read "$XENBUS_PATH/mode") - fi - -@@ -280,7 +284,7 @@ - case $t in - drbd|phy) - p=$(xenstore_read "$XENBUS_PATH/params") -- drbd_resource=$p -+ drbd_resource=${p#drbd:} - drbd_role="$(drbdadm role $drbd_resource)" - drbd_lrole="${drbd_role%%/*}" - drbd_dev="$(drbdadm sh-dev $drbd_resource)" diff --git a/_service b/_service index 5698e9f..469e04d 100644 --- a/_service +++ b/_service @@ -1,13 +1,14 @@ - git://git.linbit.com/drbd-utils.git + https://github.com/LINBIT/drbd-utils.git git drbd-utils - 9.0.0+git.%h + 9.2.0+git.%h master diff --git a/drbd-utils-9.0.0.tar.gz b/drbd-utils-9.0.0.tar.gz deleted file mode 100644 index 7b97fcc..0000000 --- a/drbd-utils-9.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1694656aa1fb34d39e30a48f4a2d3325c49d0cf6d90aec7e8579e8fa6c669315 -size 851408 diff --git a/drbd-utils-9.2.0.tar.gz b/drbd-utils-9.2.0.tar.gz new file mode 100644 index 0000000..6a177c9 --- /dev/null +++ b/drbd-utils-9.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11299b555b703440ef0af2c74b69cf6dfb833e050b87cfdc3b93d0b71d8820a6 +size 958084 diff --git a/drbd-utils.changes b/drbd-utils.changes index 54e05fc..c3b1f44 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 6 07:19:50 UTC 2017 - nwang@suse.com + +- bsc#1074169, Update to 9.2.0 + * Japanese man pages + * initial vertias cluster agent support + * quorum integration (including agents) + * improve drbd9 (mesh)/drbd-proxy integration + * pull fixups from 9.1.1 branch + * switch to github + * drbdmon: page naviagation + * debian: add mount as dependency + ------------------------------------------------------------------- Mon Oct 16 09:38:35 UTC 2017 - nwang@suse.com @@ -6,6 +19,24 @@ Mon Oct 16 09:38:35 UTC 2017 - nwang@suse.com - bsc#1061147, skip running drbdadm sh-b-pri in drbd9 Add skip_sh-b-pri_in_v9.patch +------------------------------------------------------------------- +Fri Sep 1 08:13:38 UTC 2017 - nwang@suse.com + +- Update to 9.1.0 + * allow events2 --now polling + * fix ambiguous inheritance for peer-device-options + * fixup fallback path for BLKZEROOUT for older kernels + * fix v9 proxy support + * modernized XEN scripts + * reproducible builds support + * create-md --force for v8.4 (for compat to v9) + * fix cstate output + * resize: give resize more time (same as attach) + * drbdmon: peer-device status, version info, node name + * "drbdadm status" for v8.4 + * set peer-device-options only once +- Remove Update-block-drbd-script-to-support-xen.patch + ------------------------------------------------------------------- Fri Aug 25 06:45:36 UTC 2017 - nwang@suse.com diff --git a/drbd-utils.spec b/drbd-utils.spec index 6a50086..ef515f0 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -19,7 +19,7 @@ %bcond_without drbdmon Name: drbd-utils -Version: 9.0.0 +Version: 9.2.0 Release: 0 Summary: Distributed Replicated Block Device License: GPL-2.0+ @@ -35,9 +35,8 @@ Patch4: fix-segfault-up-stacked-resource.patch # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142) Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch Patch6: fix_call_khelper_with_stack.patch -Patch7: Update-block-drbd-script-to-support-xen.patch -Patch8: move_fencing_from_disk_to_net_in_example.patch -Patch9: skip_sh-b-pri_in_v9.patch +Patch7: move_fencing_from_disk_to_net_in_example.patch +Patch8: skip_sh-b-pri_in_v9.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -79,7 +78,7 @@ device over the network to another machine. Think of it as networked raid 1. It is a building block for setting up clusters. %prep -%setup -q +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -88,7 +87,6 @@ raid 1. It is a building block for setting up clusters. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %build ./autogen.sh @@ -143,8 +141,10 @@ rm -rf %{buildroot}%{_sysconfdir}/xen %{_tmpfilesdir}/drbd.conf %doc %{_mandir}/man5/drbd.* %doc %{_mandir}/man8/drbd* +%doc %{_mandir}/ja/man5/drbd.* +%doc %{_mandir}/ja/man8/drbd* %doc COPYING -%doc README +%doc README.md %doc ChangeLog %doc scripts/drbd.conf.example %dir %{_sysconfdir}/drbd.d