From f5e8ed3d8565c1fd54d614426767f03fbd9d08bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Fri, 10 Oct 2003 21:13:37 +0000
Subject: [PATCH] Add support for tinderbox(1)'s -h option.

---
 tools/tools/tinderbox/tbmaster.1  | 7 ++++++-
 tools/tools/tinderbox/tbmaster.pl | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 9e9dad4f2a3..9bfc54337d6 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 1, 2003
+.Dd October 10, 2003
 .Dt TBMASTER 1
 .Os
 .Sh NAME
@@ -130,6 +130,11 @@ environment variable.
 Note that it will not be defined unless it passes some simple sanity
 checks.
 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.
 .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 01d6da41729..a7026391df8 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -35,7 +35,7 @@ use Fcntl qw(:DEFAULT :flock);
 use POSIX;
 use Getopt::Long;
 
-my $VERSION	= "2.1";
+my $VERSION	= "2.2";
 my $COPYRIGHT	= "Copyright (c) 2003 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -49,6 +49,7 @@ my %CONFIG = (
     'PLATFORMS'	=> [ 'i386' ],
     'DATE'	=> '',
     'SANDBOX'	=> '/tmp/tinderbox',
+    'HOSTNAME'	=> '',
     'LOGDIR'	=> '%%SANDBOX%%/logs',
     'TARGETS'	=> [ 'update', 'world' ],
     'OPTIONS'	=> [],
@@ -187,6 +188,8 @@ sub tinderbox($$$) {
 
     # Fork and start the tinderbox
     my @args = @{$CONFIG{'OPTIONS'}};
+    push(@args, "--hostname=" . expand('HOSTNAME'))
+	if ($CONFIG{'HOSTNAME'});
     push(@args, "--sandbox=" . expand('SANDBOX'));
     push(@args, "--branch=$branch");
     push(@args, "--arch=$arch");