Hello community, here is the log from the commit of package drbd-utils for openSUSE:Factory checked in at 2017-07-26 13:05:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old) and /work/SRC/openSUSE:Factory/.drbd-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils" Wed Jul 26 13:05:03 2017 rev:15 rq:512457 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2017-06-23 09:18:46.818912430 +0200 +++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes 2017-07-26 13:05:10.499113079 +0200 @@ -1,0 +2,7 @@ +Tue Jul 25 08:35:18 UTC 2017 - [email protected] + +- bsc#1048671, Fix handler called from kernel always invalid + for stacking resource +- Add fix_call_khelper_with_stack.patch + +------------------------------------------------------------------- New: ---- fix_call_khelper_with_stack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-utils.spec ++++++ --- /var/tmp/diff_new_pack.61YP3o/_old 2017-07-26 13:05:15.866355857 +0200 +++ /var/tmp/diff_new_pack.61YP3o/_new 2017-07-26 13:05:15.870355292 +0200 @@ -32,6 +32,7 @@ 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 Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -76,6 +77,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build ./autogen.sh ++++++ fix_call_khelper_with_stack.patch ++++++ >From 7ba13eefd22b1ab3c84bd115dded3e4dbbf5b5c8 Mon Sep 17 00:00:00 2001 From: Nick Wang <[email protected]> Date: Mon, 17 Jul 2017 16:41:08 +0800 Subject: [PATCH] drbdadm: Fix handler called from kernel invalid return for stacking resource Handler like "before-resync-target" called from kernel space does not have "-S" option for stacking resource, it always return as invalid usage for stacking resource in normal mode, then the connection will be dropped. Add "-S" option for stacking resource automatically if the handler is called from kernel. --- user/v9/drbdadm_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/v9/drbdadm_main.c b/user/v9/drbdadm_main.c index 3c6e2263..f6cd8b74 100644 --- a/user/v9/drbdadm_main.c +++ b/user/v9/drbdadm_main.c @@ -3472,6 +3472,9 @@ int main(int argc, char **argv) rv = E_USAGE; continue; } + if (3 == cmd->show_in_usage && ctx.res->stacked) { + is_drbd_top = 1; + } if (is_drbd_top != ctx.res->stacked && !is_dump) { err("'%s' is a %s resource, and not available in %s mode.\n", ctx.res->name, -- 2.12.0
