No functional change; no callers as yet.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
Acked-by: Ian Campbell <ian.campb...@citrix.com>
---
Osstest.pm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Osstest.pm b/Osstest.pm
index 95e4d46..20b8f62 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -30,7 +30,7 @@ BEGIN {
@ISA = qw(Exporter);
@EXPORT = qw(
readglobalconfig %c $mjobdb $mhostdb
- augmentconfigdefaults
+ augmentconfigdefaults globalconfigfiles
csreadconfig
getmethod
postfork
@@ -124,6 +124,10 @@ sub getmethod {
return $r;
}
+sub globalconfigfiles () {
+ $ENV{'OSSTEST_CONFIG'} || "$ENV{'HOME'}/.xen-osstest/config";
+}
+
sub readglobalconfig () {
our $readglobalconfig_done;
return if $readglobalconfig_done;
@@ -135,7 +139,7 @@ sub readglobalconfig () {
$c{AuthorizedKeysFiles} = '';
$c{AuthorizedKeysAppend} = '';
- my $cfgfiles = $ENV{'OSSTEST_CONFIG'} ||
"$ENV{'HOME'}/.xen-osstest/config";
+ my $cfgfiles = globalconfigfiles();
my $readcfg;
$readcfg = sub ($$) {
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
