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

fix bug: 4310 xdsh to Cisco SG300-52 switch does not work, don't affect the original supporting

Browse Source
This commit is contained in:
zhaoertao 2014-10-22 15:39:24 -07:00
parent de215daef3
commit 0096a8dde0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-server/lib/perl/xCAT/RShellAPI.pm
View File

@ -146,6 +146,7 @@ sub run_remote_shell_api {
my $pw_tried=0;
my $login_done=0;
my ($prematch, $match)= $t->waitfor(Match => '/login[: ]*$/i',
Match => '/username[: ]*$/i',
Match => '/User Name[: ]*$/i',
Match => '/password[: ]*$/i',
Match => "/$prompt/",
@ -155,7 +156,7 @@ sub run_remote_shell_api {
}
if ($match =~ /$prompt/) {
$login_done=1;
} elsif (($match =~ /User Name[: ]*$/i) || ($match =~ /login[: ]*$/i )) {
} elsif (($match =~ /User Name[: ]*$/i) || ($match =~ /username[: ]*$/i) || ($match =~ /login[: ]*$/i )) {
# user name
if ($user) {
if (! $t->put(String => "$user\n",