Commit 6c9d580f authored by Leigh Stoller's avatar Leigh Stoller

ElabInElab change resulting from Mike having added the tiplines table

to the inner DB (so that the console icon is displayed). Make sure
that we do not try to run console_setup inside by checking the server
and keydata fields (which is now cleared for the inner elab).
parent 93fc47db
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -86,7 +86,8 @@ foreach my $node (@nodes) {
#
$tiplines_result =
DBQueryFatal("select tipname,server from tiplines ".
"where node_id='$node'");
"where node_id='$node' and ".
"server!='' and keydata is not null");
if (! $tiplines_result->numrows) {
next;
......
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