From 4a72a291ea24a7e76c33a4fedaea55fc2cf8929e Mon Sep 17 00:00:00 2001 From: zhanx Date: Thu, 7 May 2009 08:07:24 +0000 Subject: [PATCH] fix defect 'if no file under /etc/xcat/hostkeys, installation hangs': bug id:2788254 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3301 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/credentials.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/credentials.pm b/xCAT-server/lib/xcat/plugins/credentials.pm index e0dd51e03..fe5e32ec9 100644 --- a/xCAT-server/lib/xcat/plugins/credentials.pm +++ b/xCAT-server/lib/xcat/plugins/credentials.pm @@ -134,12 +134,14 @@ sub process_request } elsif (/ssh_dsa_hostkey/) { unless (-r "/etc/xcat/hostkeys/ssh_host_dsa_key") { push @{$rsp->{'error'}},"Unable to read private DSA key from /etc/xcat/hostkeys"; + next; } $tfilename="/etc/xcat/hostkeys/ssh_host_dsa_key"; } elsif (/ssh_rsa_hostkey/) { unless (-r "/etc/xcat/hostkeys/ssh_host_rsa_key") { push @{$rsp->{'error'}},"Unable to read private RSA key from /etc/xcat/hostkeys"; + next; } $tfilename="/etc/xcat/hostkeys/ssh_host_rsa_key";