diff options
| author | des <des@FreeBSD.org> | 2006-03-02 13:58:04 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-02 13:58:04 +0000 |
| commit | 1cd6b779ce038b37eddbd5220b5bbdddff041d71 (patch) | |
| tree | 2dd708fa67a33f8923afd933c4e32c57354ef831 | |
| parent | dec8ea3d4af41e9d16565d80233e52d3ba3032b1 (diff) | |
| download | FreeBSD-src-1cd6b779ce038b37eddbd5220b5bbdddff041d71.zip FreeBSD-src-1cd6b779ce038b37eddbd5220b5bbdddff041d71.tar.gz | |
Read site.rc after default.rc.
| -rw-r--r-- | tools/tools/tinderbox/tbmaster.1 | 6 | ||||
| -rw-r--r-- | tools/tools/tinderbox/tbmaster.pl | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1 index 5d5f07d..36ec9bf 100644 --- a/tools/tools/tinderbox/tbmaster.1 +++ b/tools/tools/tinderbox/tbmaster.1 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 20, 2005 +.Dd March 2, 2006 .Dt TBMASTER 1 .Os .Sh NAME @@ -78,7 +78,9 @@ In addition, .Nm attempts to read .Pa default.rc -before reading the actual configuration file; thus, that file may be +and +.Pa site.rc +before reading the actual configuration file; thus, these files may be used to specify default values shared by multiple configurations. .Pp The configuration consists of a list of single- or multiple-value diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl index cfe8429..4902653 100644 --- a/tools/tools/tinderbox/tbmaster.pl +++ b/tools/tools/tinderbox/tbmaster.pl @@ -474,6 +474,7 @@ sub tbmaster($) { clearconf(); readconf('default.rc'); + readconf('site.rc'); readconf("$config.rc") or die("$config.rc: $!\n"); $CONFIG{'CONFIG'} = $config; |
