arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug 2898857

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5316 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wuzhy
2010-03-01 04:49:11 +00:00
parent b706f06d54
commit 063abca243
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
perl-xCAT/xCAT/PPCcli.pm
View File

@@ -523,6 +523,7 @@ sub mkvterm {
# character preceeded with \000 (blank??)
#
##########################################
my $fail_msg = "HSCL";
my $ivm_open = "Virtual terminal is already connected";
my $hmc_open = "\000o\000p\000e\000n\000 \000f\000a\000i\000l\000e\000d";
my $hmc_open2 =
@@ -558,7 +559,7 @@ sub mkvterm {
# Expect result
##########################################
my @result = $ssh->expect( $timeout,
[ "$hmc_open|$hmc_open2|$ivm_open",
[ "$hmc_open|$hmc_open2|$ivm_open|$fail_msg",
sub {
$failed = 1;
} ]
@@ -566,7 +567,11 @@ sub mkvterm {
if ( $failed ) {
$ssh->hard_close();
return( [RC_ERROR,"Virtual terminal is already connected"] );
if (grep(/$fail_msg/, @result)) {
return( [RC_ERROR, "mkvterm returns the unsuccessful value, please check your entry and retry the command."] );
} else {
return( [RC_ERROR,"Virtual terminal is already connected"] );
}
}
##########################################