Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 95413d6cf..beb19cef6 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -37,8 +37,8 @@ def main():
 
     coremodule = backends[setup['backend']]
     try:
-        Core = getattr(__import__("Bcfg2.Server.%s" % coremodule).Server,
-                       coremodule).Core
+        corecls = getattr(__import__("Bcfg2.Server.%s" % coremodule).Server,
+                          coremodule).Core
     except ImportError:
         err = sys.exc_info()[1]
         print("Unable to import %s server core: %s" % (setup['backend'], err))
@@ -49,7 +49,7 @@ def main():
         raise
 
     try:
-        core = Core()
+        core = corecls(setup)
         core.run()
     except CoreInitError:
         msg = sys.exc_info()[1]