From eabb212e587a7ae45c9fca818b8027ca1f82b369 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 24 Jul 2020 08:12:53 -0400
Subject: [PATCH] Fix setupssh.sh without ssh_config.d

It was modifying the installer ssh_config
rather than the target ssh_config
---
 confluent_osdeploy/el7/profiles/default/scripts/setupssh.sh   | 2 +-
 confluent_osdeploy/el8/profiles/default/scripts/setupssh.sh   | 2 +-
 confluent_osdeploy/rhvh4/profiles/default/scripts/setupssh.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/confluent_osdeploy/el7/profiles/default/scripts/setupssh.sh b/confluent_osdeploy/el7/profiles/default/scripts/setupssh.sh
index 6d3fbf52..909829c5 100644
--- a/confluent_osdeploy/el7/profiles/default/scripts/setupssh.sh
+++ b/confluent_osdeploy/el7/profiles/default/scripts/setupssh.sh
@@ -3,7 +3,7 @@ grep HostCert /etc/ssh/sshd_config.anaconda >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedAuthentication yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedUsesNameFromPacketOnly yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo IgnoreRhosts no >> /mnt/sysimage/etc/ssh/sshd_config
-sshconf=/etc/ssh/ssh_config
+sshconf=/mnt/sysimage/etc/ssh/ssh_config
 if [ -d /mnt/sysimage/etc/ssh/ssh_config.d/ ]; then
     sshconf=/mnt/sysimage/etc/ssh/ssh_config.d/01-confluent.conf
 fi
diff --git a/confluent_osdeploy/el8/profiles/default/scripts/setupssh.sh b/confluent_osdeploy/el8/profiles/default/scripts/setupssh.sh
index 6d3fbf52..909829c5 100644
--- a/confluent_osdeploy/el8/profiles/default/scripts/setupssh.sh
+++ b/confluent_osdeploy/el8/profiles/default/scripts/setupssh.sh
@@ -3,7 +3,7 @@ grep HostCert /etc/ssh/sshd_config.anaconda >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedAuthentication yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedUsesNameFromPacketOnly yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo IgnoreRhosts no >> /mnt/sysimage/etc/ssh/sshd_config
-sshconf=/etc/ssh/ssh_config
+sshconf=/mnt/sysimage/etc/ssh/ssh_config
 if [ -d /mnt/sysimage/etc/ssh/ssh_config.d/ ]; then
     sshconf=/mnt/sysimage/etc/ssh/ssh_config.d/01-confluent.conf
 fi
diff --git a/confluent_osdeploy/rhvh4/profiles/default/scripts/setupssh.sh b/confluent_osdeploy/rhvh4/profiles/default/scripts/setupssh.sh
index 6d3fbf52..909829c5 100644
--- a/confluent_osdeploy/rhvh4/profiles/default/scripts/setupssh.sh
+++ b/confluent_osdeploy/rhvh4/profiles/default/scripts/setupssh.sh
@@ -3,7 +3,7 @@ grep HostCert /etc/ssh/sshd_config.anaconda >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedAuthentication yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo HostbasedUsesNameFromPacketOnly yes >> /mnt/sysimage/etc/ssh/sshd_config
 echo IgnoreRhosts no >> /mnt/sysimage/etc/ssh/sshd_config
-sshconf=/etc/ssh/ssh_config
+sshconf=/mnt/sysimage/etc/ssh/ssh_config
 if [ -d /mnt/sysimage/etc/ssh/ssh_config.d/ ]; then
     sshconf=/mnt/sysimage/etc/ssh/ssh_config.d/01-confluent.conf
 fi