mirror of
https://github.com/xcat2/xcat-core.git
synced 2025-06-16 19:30:26 +00:00
Merge branch 'confluent_netboot', contains a change in the LparNetbootExp
that invokes the console help message to detect if we are in the console. Conserver and Confluent messages are different
This commit is contained in:
@ -2660,14 +2660,27 @@ sub lparnetbootexp
|
||||
####################################
|
||||
nc_msg($verbose, "Connecting to the $node.\n");
|
||||
sleep 3;
|
||||
|
||||
# Send Ctrl-E, c and ? to get the help to come out to support
|
||||
# both confluent and conserver consoles
|
||||
$rconsole->send("\005c?");
|
||||
# for some reason the ctrl-e is not being sent for confluent, just getting c?
|
||||
|
||||
$timeout = 10;
|
||||
$rconsole->expect(
|
||||
$timeout,
|
||||
[ qr/Enter.* for help.*/i =>
|
||||
[ qr/c?/i =>
|
||||
sub {
|
||||
$rc = 0;
|
||||
$rconsole->clear_accum();
|
||||
nc_msg($verbose, "Connected.\n");
|
||||
nc_msg($verbose, "Confluent -> Connected.\n");
|
||||
}
|
||||
],
|
||||
[ qr/help.*/i =>
|
||||
sub {
|
||||
$rc = 0;
|
||||
$rconsole->clear_accum();
|
||||
nc_msg($verbose, "Conserver -> Connected.\n");
|
||||
}
|
||||
],
|
||||
[ timeout =>
|
||||
|
Reference in New Issue
Block a user