diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-02-08 19:24:37 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2010-02-08 19:24:37 +0000 |
| commit | 42cffe6228369a75f27c14eea22ad13baf2c0854 (patch) | |
| tree | ed3a19a831c3b54b9d472671814d7bf77ab16eb5 /src/lib/Server/Core.py | |
| parent | 8f265b38c7798d7933173d4dcbe9e6b3ad736c4c (diff) | |
| download | bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.tar.gz bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.tar.bz2 bcfg2-42cffe6228369a75f27c14eea22ad13baf2c0854.zip | |
Snapshots: Use custom bcfg2.conf when specified (Fix for #839)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5716 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Core.py')
| -rw-r--r-- | src/lib/Server/Core.py | 4 |
1 files changed, 3 insertions, 1 deletions
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' |