Commit 99a907dd authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

New I forgot something; When coming out of admin mode, wait for just ISUP.

parent 3d6c36b3
...@@ -182,12 +182,22 @@ DBQueryFatal("update nodes set startupcmd='', startstatus='none' ". ...@@ -182,12 +182,22 @@ DBQueryFatal("update nodes set startupcmd='', startstatus='none' ".
# #
if ($reboot) { if ($reboot) {
if ($waitmode) { if ($waitmode) {
$StateWait::debug = 0;
# #
# Initialize the statewait library. # Initialize the statewait library.
# #
my @states = (TBDB_NODESTATE_MFSSETUP(), TBDB_NODESTATE_ISUP()); my @states = ();
my @finished = (); my @finished = ();
my @failed = (); my @failed = ();
#
# Only wait for MFSSETUP when going into the MFS. When coming out
# of MFS, just wait for generic ISUP.
#
push(@states, TBDB_NODESTATE_MFSSETUP())
if ($onoff eq "on");
push(@states, TBDB_NODESTATE_ISUP());
if (initStateWait(\@states, @nodes)) { if (initStateWait(\@states, @nodes)) {
die("*** $0:\n". die("*** $0:\n".
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment