Use `uname -n` as default for the HOSTNAME configuration variable.

2 files changed, 7 insertions, 4 deletions

diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 1dbcb09..1ffc6b8 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -139,8 +139,11 @@ Read-only.
 .It HOSTNAME
 .Pq Vt single
 The name of the host running the tinderbox.
-This is used for cosmetic purposes only.
-No default value.
+This defaults to the name reported by the
+.Fl n
+option of the
+.Xr uname 1
+command, and is only used for cosmetic purposes.
 .It LOGDIR
 .Pq Vt single
 The location of the log directory.
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index c96b483..45e4e60 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -224,8 +224,7 @@ sub tinderbox($$$) {
 
     # Fork and start the tinderbox
     my @args = @{$CONFIG{'OPTIONS'}};
-    push(@args, "--hostname=" . expand('HOSTNAME'))
-	if ($CONFIG{'HOSTNAME'});
+    push(@args, "--hostname=" . expand('HOSTNAME'));
     push(@args, "--sandbox=" . expand('SANDBOX'));
     push(@args, "--arch=$arch");
     push(@args, "--machine=$machine");
@@ -355,6 +354,7 @@ MAIN:{
     $config = `uname -n`;
     chomp($config);
     $config =~ s/^(\w+)(\..*)?/$1/;
+    $CONFIG{'HOSTNAME'} = `/usr/bin/uname -n`;
     if ($ENV{'HOME'} =~ m/^((?:\/[\w\.-]+)+)\/*$/) {
 	$CONFIG{'HOME'} = $1;
 	$etcdir = "$1/etc";