File kdump-openssh-files-in-kdumprd.patch of Package kdump.2364

From: Petr Tesarik <ptesarik@suse.cz>
Subject: Copy openssh files to kdumprd
References: FATE#318874, bsc#917747
Patch-mainline: v0.8.16
Git-commit: b117666f24e4c8663c4abe5c0e2672db54a00294

Copy the ssh binary to kdumprd when sftp is requested

Since the sftp protocol is now implemented using the "ssh" binary,
it must be available at dump time.

Signed-off-by: Petr Tesarik <ptesarik@suse.cz>

---
 init/setup-kdump.functions |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/init/setup-kdump.functions
+++ b/init/setup-kdump.functions
@@ -554,7 +554,6 @@ function kdump_modify_config()						   #
     # Special handling for some protocols
     KDUMP_SAVEDIR=
     kdump_over_ssh=
-    local copy_ssh=
     local i=0
     while [ $i -le $kdump_max ] ; do
 	protocol="${kdump_Protocol[i]}"
@@ -572,7 +571,6 @@ function kdump_modify_config()						   #
 	if [ "$protocol" = "sftp" -o \
 	     "$protocol" = "ssh" ] ; then
             kdump_over_ssh=yes
-	    test "$protocol" = "ssh" && copy_ssh=ssh
             if [ -z "$KDUMP_HOST_KEY" ] ; then
 		KDUMP_HOST_KEY=$(
 		    ssh-keygen -F "$kdump_Host" 2>/dev/null | \
@@ -587,7 +585,7 @@ function kdump_modify_config()						   #
     done
 
     # copy ssh if needed
-    if [ -n "$copy_ssh" ] ; then
+    if [ -n "$kdump_over_ssh" ] ; then
 	KDUMP_REQUIRED_PROGRAMS="$KDUMP_REQUIRED_PROGRAMS ssh"
     fi