From 887d901e2407c9589437ca1903dda3fbb05d337b Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Tue, 30 Aug 2011 13:05:29 +0000 Subject: [PATCH] Fixed one timing issue that in open firmware 'Select this console as the active console press 0' msg passed quite quickly and this makes lpar_netboot.expect messed up with next msg after it. Adjust expect cases to put 'ok(.*)0 >' as the highest priority than '(.*)elect this consol(.*)' git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10397 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/lpar_netboot.expect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/sbin/lpar_netboot.expect b/xCAT-server/sbin/lpar_netboot.expect index a4cf7b3f9..c7a0723bd 100644 --- a/xCAT-server/sbin/lpar_netboot.expect +++ b/xCAT-server/sbin/lpar_netboot.expect @@ -2387,6 +2387,10 @@ nc_msg "$PROGRAM Status: Check for active console.\n" while { ! $done } { expect { -i $spawn_id_rconsole + -re "ok(.*)0 >" { + nc_msg "$PROGRAM Status: at ok prompt\n" + set done 1 + } -re "(.*)elect this consol(.*)" { nc_msg "$PROGRAM Status: selecting active console\n" set command "0" @@ -2407,10 +2411,6 @@ while { ! $done } { send_user "$PROGRAM Status: FSP password is invalid.\n" exit 1 } - -re "ok(.*)0 >" { - nc_msg "$PROGRAM Status: at ok prompt\n" - set done 1 - } -re "SMS(.*)Navigation Keys" { nc_msg "$PROGRAM Status: SMS\n" set done 1