Commit f4d4dd0e authored by Mike Hibler's avatar Mike Hibler

Change sshtb to allow "-host $BOSSNODE".

Needed when boss is the tip server (i.e., for IPMI consoles).

Somehow this vaguely feels like a potential flaw. Prior to this,
a misconfigured sshtb command that specified boss would fail.
Now it will succeed and run in the one place it can cause the
most damage.

Also, fix a couple of nits in the console code.
parent 9c0a2f0d
...@@ -179,7 +179,7 @@ foreach my $server (keys(%cmdargs)) { ...@@ -179,7 +179,7 @@ foreach my $server (keys(%cmdargs)) {
my $args = $cmdargs{$server}; my $args = $cmdargs{$server};
if (system("$SSH -host $server $PROG $args")) { if (system("$SSH -host $server $PROG $args")) {
print STDERR "*** Failed: $SSH $server $PROG $args: $?\n"; print STDERR "*** Failed: $SSH -host $server $PROG $args: $?\n";
exit 1; exit 1;
} }
} }
......
...@@ -35,7 +35,7 @@ use English; ...@@ -35,7 +35,7 @@ use English;
# to the capture process, and then reset the files to the proper group. # to the capture process, and then reset the files to the proper group.
# #
# #
my $TIPLOGDIR = "/var/log/tiplogs"; my $TIPLOGDIR = "/usr/testbed/log/tiplogs";
my $TIPDEVDIR = "/dev/tip"; my $TIPDEVDIR = "/dev/tip";
my $dbg = 1; my $dbg = 1;
my %tipgroup = (); my %tipgroup = ();
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -110,7 +110,8 @@ if (!defined($hostname)) { ...@@ -110,7 +110,8 @@ if (!defined($hostname)) {
# #
my @cmdargs; my @cmdargs;
if ($hostname eq $FSNODE && $FSNODE eq $BOSSNODE) { if ($hostname eq $BOSSNODE ||
($hostname eq $FSNODE && $FSNODE eq $BOSSNODE)) {
@cmdargs = "@ARGV"; @cmdargs = "@ARGV";
$runlocal = 1; $runlocal = 1;
} }
......
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