From: Harald Hoyer <harald@redhat.com>
Date: Fri, 29 Aug 2014 12:06:57 +0000 (+0200)
Subject: ssh-client: handle /etc/ssh/ssh_config
X-Git-Tag: RHEL-7.1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=828fd83bc1816bacb24b13106f935b2fbd0964a4;p=thirdparty%2Fdracut.git

ssh-client: handle /etc/ssh/ssh_config

- disable ProxyCommand
- install the GlobalKnownHostsFile

https://bugzilla.redhat.com/show_bug.cgi?id=1086778
---

diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh
index 66e5307d5..f60e9631c 100755
--- a/modules.d/95ssh-client/module-setup.sh
+++ b/modules.d/95ssh-client/module-setup.sh
@@ -41,7 +41,15 @@ inst_sshenv()
 
     # Copy over root and system-wide ssh configs.
     [[ -f /root/.ssh/config ]] && inst_simple /root/.ssh/config
-    [[ -f /etc/ssh/ssh_config ]] && inst_simple /etc/ssh/ssh_config
+    if [[ -f /etc/ssh/ssh_config ]]; then
+        inst_simple /etc/ssh/ssh_config
+        sed -i -e 's/\(^[[:space:]]*\)ProxyCommand/\1# ProxyCommand/' ${initdir}/etc/ssh/ssh_config
+        while read key val; do
+            [[ key != "GlobalKnownHostsFile" ]] && continue
+            inst_simple "$val"
+            break
+        done < /etc/ssh/ssh_config
+    fi
 
     return 0
 }