2 files changed, 4 insertions, 6 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 5b5053135..bb44bbc3f 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -2,7 +2,7 @@
 '''bcfg2-admin is a script that helps to administrate a bcfg2 deployment'''
 
 import getopt, logging, sys
-import Bcfg2.Server.Core, Bcfg2.Logging
+import Bcfg2.Server.Core, Bcfg2.Logging, Bcfg2.Options
 
 log = logging.getLogger('bcfg-admin')
 
@@ -17,10 +17,8 @@ def mode_import(modename):
 
 if __name__ == '__main__':
     Bcfg2.Logging.setup_logging('bcfg2-admin', to_console=True)
-
-    # Some sensible defaults
-    configfile = "/etc/bcfg2.conf"
-
+    # Get config file path
+    configfile = Bcfg2.Options.CFILE.default
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'hC:', ['help', 'configfile='])
     except getopt.GetoptError, msg:
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 65310d6ee..dac7fa6bf 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -277,7 +277,7 @@ if __name__ == '__main__':
 
     loop = infoCore(setup['repo'], setup['structures'], setup['generators'],
                     setup['password'], setup['svn'])
-    loop.plugins['Metadata'].load_probedata()
+    loop.plugins['Metadata']
     if "args" in setup and setup['args']:
         loop.onecmd(" ".join(setup['args']))
         raise SystemExit(0)