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

Fixed bug 3178887: getmacs with NEI-> ping result is not correct

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9565 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2011-05-11 11:13:51 +00:00
parent 1549dc1506
commit bd88c433f9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/sbin/lpar_netboot.expect
View File

@ -984,21 +984,21 @@ proc ping_server { full_path_name phandle } {
set done(0) 0
set cmd(0) "dev $full_path_name\r"
set msg(0) "$PROGRAM Status: selected $full_path_name as the active adapter\n"
set pattern(0) "(.*)0 >(.*)"
set pattern(0) ".*dev(.*)0 >(.*)"
set newstate(0) 1
# state 1, send property command to set selected type
set done(1) 0
set cmd(1) "\" ethernet,$adap_speed,$adap_conn,$adap_duplex\" encode-string \" chosen-network-type\" property\r"
set msg(1) "$PROGRAM Status: chosen network type set\n"
set pattern(1) "(.*)0 >(.*)"
set pattern(1) ".*ethernet(.*)0 >(.*)"
set newstate(1) 2
# state 2, activate /packages/net
set done(2) 0
set cmd(2) "dev /packages/net\r"
set msg(2) "$PROGRAM Status: selected the /packages/net node as the active package\n"
set pattern(2) "(.*)ok(.*)0 >(.*)"
set pattern(2) ".*dev(.*)ok(.*)0 >(.*)"
set newstate(2) 3
# state 3, ping the server
@ -1018,7 +1018,7 @@ proc ping_server { full_path_name phandle } {
} else {
set cmd(3) "ping $full_path_name:$server_ip,$client_ip,$gateway_ip\r"
}
set pattern(3) "(.*)ok(.*)0 >(.*)"
set pattern(3) ".*ping(.*)ok(.*)0 >(.*)"
# state 4, all done
set done(4) 0
@ -1103,6 +1103,7 @@ proc ping_server { full_path_name phandle } {
set ping_debug $expect_out(buffer)
}
if { ( ($tty_do_ping == 1) && ($state == 5) ) || ($tty_do_ping != 1) && ($state == 4) } {
if { ($tty_do_ping == 1) && ($state == 5) } {
set ping_rc $expect_out(1,string)
@ -1709,7 +1710,7 @@ proc multiple_open-dev {} {
set timeout 30
expect {
-i $spawn_id_rconsole
-re ">" {
-re "patch new-open-dev(.*)>" {
nc_msg "$PROGRAM Status: at End of multiple_open-dev \n"
}
-re "]" {