From 39e7286e789e5757e3871d2ca2f21ec61cad1e49 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Wed, 27 Oct 2004 00:13:27 +0000
Subject: [PATCH] ElabInElab change; switch from node_types.control_net to
interfaces.role.
---
tbsetup/named_setup.in | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tbsetup/named_setup.in b/tbsetup/named_setup.in
index 909704ea7b..188819ea27 100644
--- a/tbsetup/named_setup.in
+++ b/tbsetup/named_setup.in
@@ -151,8 +151,9 @@ my $db_result =
"left join interfaces as i on n.phys_nodeid=i.node_id ".
"where (n.role='testnode' or n.role='virtnode') ".
" and (i.IP is not null or n.jailip is not null) ".
- " and (i.card is null or i.card=nt.control_net " .
- " or i.role='gw') ");
+ " and (i.card is null or ".
+ " i.role='" . TBDB_IFACEROLE_CONTROL() . "' or " .
+ " i.role='" . TBDB_IFACEROLE_GW() . "') ");
#
# Sort out the routable and unroutable addresses, and make a map for reversing
@@ -184,7 +185,7 @@ while (my @row = $db_result->fetchrow_array()) {
# Special treatment for gateway interfaces - we give act as if they are a
# separate node
#
- if ($irole && $irole eq "gw") {
+ if ($irole && $irole eq TBDB_IFACEROLE_GW()) {
$node_id = "$node_id-gw";
}
--
GitLab