diff options
Diffstat (limited to 'src/sbin/bcfg2-admin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index ba979ec3b..fb9a58c7d 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -3,7 +3,6 @@ import getopt, difflib, logging, lxml.etree, os, popen2, re, socket, sys, ConfigParser import Bcfg2.Server.Core, Bcfg2.Logging -from Bcfg2.Settings import settings log = logging.getLogger('bcfg-admin') @@ -19,7 +18,8 @@ def mode_import(modename): if __name__ == '__main__': Bcfg2.Logging.setup_logging('bcfg2-admin', to_console=True) - configfile = settings.CONFIG_FILE + # Some sensible defaults + configfile = "/etc/bcfg2.conf" try: opts, args = getopt.getopt(sys.argv[1:], 'hC:', ['help', 'configfile=']) @@ -36,9 +36,6 @@ if __name__ == '__main__': if opt in ("-C", "--configfile"): configfile = arg - # override default settings - settings.read_config_file(configfile) - modes = [x.lower() for x in Bcfg2.Server.Admin.__all__] modes.remove('mode') @@ -55,8 +52,7 @@ if __name__ == '__main__': mode_cls = mode_import(modname) except ImportError, e: log.error("Failed to load admin mod %s: %s" % (modname, e)) - raise SystemExit(0) - mode = mode_cls() + mode = mode_cls(configfile) mode(args[1:]) else: print "unknown mode %s" % args[0] |