From a035f982d44ad0b531c3083fcc27fe56c66bc1b2 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 11 May 2009 12:16:54 +0000
Subject: [PATCH] hostkey check must be in both the /install/postscript/hostkey
  and the /etc/xcat/hostkey directory

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3334 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index a89d8cf53..8dcbfd9e4 100644
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -281,7 +281,8 @@ if (-f "/install/postscripts/hostkeys/ssh_host_key")
 
 # if hostkey does not exist or force option, regenerate
 my $hostkey = "/install/postscripts/hostkeys/ssh_host_rsa_key.pub";
-if ((!-r $hostkey) || $::FORCE)
+my $hostkey2 = "/etc/xcat/hostkeys/ssh_host_rsa_key.pub";
+if ((!-r $hostkey) || (!-r $hostkey2) || $::FORCE)
 {
 
     # remove the old keys