Commit 4b18be17 authored by Mike Hibler's avatar Mike Hibler

Make sure nodessh script works in a world with DISABLE_NAMED_SETUP.

parent 03478fb9
......@@ -5020,6 +5020,7 @@ NFSTRACESUPPORT=0
TBLOGFACIL="local5"
BOSSEVENTPORT=16505
UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564
FRISEBEENUMPORTS=0
......
......@@ -296,6 +296,7 @@ NFSTRACESUPPORT=0
TBLOGFACIL="local5"
BOSSEVENTPORT=16505
UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564
FRISEBEENUMPORTS=0
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
# Lets emulate register_globals=off for a while.
......@@ -57,6 +57,7 @@ $EXPOSETEMPLATES= 0;
$USERSELECTUIDS = 1;
$REMOTEWIKIDOCS = @REMOTEWIKIDOCS@;
$GMAP_API_KEY = "@GMAP_API_KEY@";
$NONAMEDSETUP = @DISABLE_NAMED_SETUP@;
$TBMAILADDR_OPS = "@TBOPSEMAIL_NOSLASH@";
$TBMAILADDR_WWW = "@TBWWWEMAIL_NOSLASH@";
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -70,7 +70,11 @@ header("Content-Type: text/x-testbed-ssh");
header("Content-Disposition: inline; filename=$filename;");
header("Content-Description: SSH description file for a testbed node");
echo "hostname: $vname.$eid.$pid.$OURDOMAIN\n";
if ($NONAMEDSETUP) {
echo "hostname: $node_id.$OURDOMAIN\n";
} else {
echo "hostname: $vname.$eid.$pid.$OURDOMAIN\n";
}
echo "login: $uid\n";
if ($isvirt) {
......
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