From 42cffe6228369a75f27c14eea22ad13baf2c0854 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 8 Feb 2010 19:24:37 +0000 Subject: Snapshots: Use custom bcfg2.conf when specified (Fix for #839) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5716 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Core.py') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index efb6f10a3..712c87c8e 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -36,7 +36,8 @@ class Core(Component): name = 'bcfg2-server' implementation = 'bcfg2-server' - def __init__(self, repo, plugins, password, encoding, ca=None, + def __init__(self, repo, plugins, password, encoding, + cfile='/etc/bcfg2.conf', ca=None, filemonitor='default', start_fam_thread=False): Component.__init__(self) self.datastore = repo @@ -51,6 +52,7 @@ class Core(Component): raise CoreInitError, "failed to instantiate fam driver (used %s)" % \ filemonitor self.pubspace = {} + self.cfile = cfile self.cron = {} self.plugins = {} self.revision = '-1' -- cgit v1.2.3-1-g7c22