From 99a907ddbc9a8adca3ea2332a85eac6df8754eb8 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Wed, 22 Dec 2004 22:36:51 +0000
Subject: [PATCH] New I forgot something; When coming out of admin mode, wait
for just ISUP.
---
utils/node_admin.in | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/utils/node_admin.in b/utils/node_admin.in
index c22b329f66..5b794cc888 100755
--- a/utils/node_admin.in
+++ b/utils/node_admin.in
@@ -182,12 +182,22 @@ DBQueryFatal("update nodes set startupcmd='', startstatus='none' ".
#
if ($reboot) {
if ($waitmode) {
+ $StateWait::debug = 0;
+
#
# Initialize the statewait library.
#
- my @states = (TBDB_NODESTATE_MFSSETUP(), TBDB_NODESTATE_ISUP());
+ my @states = ();
my @finished = ();
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)) {
die("*** $0:\n".
--
GitLab