From: zhao er t. <xca...@so...> - 2014-10-22 14:00:28
|
The branch, master has been updated via de215daef344a42cb38b51ebb3776723f9d38d99 (commit) from 75f15ce9b7179c554d713ca301258c6f194f3155 (commit) ----------------------------------------------------------------------- commit de215daef344a42cb38b51ebb3776723f9d38d99 Author: zhaoertao <er...@cn...> Date: Wed Oct 22 14:55:08 2014 -0700 fix bug: 4310 xdsh to Cisco SG300-52 switch does not work ----------------------------------------------------------------------- diff --git a/xCAT-server/lib/perl/xCAT/RShellAPI.pm b/xCAT-server/lib/perl/xCAT/RShellAPI.pm index e6fbdad..c3390d2 100644 --- a/xCAT-server/lib/perl/xCAT/RShellAPI.pm +++ b/xCAT-server/lib/perl/xCAT/RShellAPI.pm @@ -146,7 +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/", Errmode => "return"); @@ -155,7 +155,7 @@ sub run_remote_shell_api { } if ($match =~ /$prompt/) { $login_done=1; - } elsif (($match =~ /username[: ]*$/i) || ($match =~ /login[: ]*$/i )) { + } elsif (($match =~ /User Name[: ]*$/i) || ($match =~ /login[: ]*$/i )) { # user name if ($user) { if (! $t->put(String => "$user\n", |