diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-26 13:19:58 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-26 13:19:58 -0500 |
| commit | 75c6e2ac28a6f406d679a44dc399c5eb6d6d25e1 (patch) | |
| tree | 28a76153bba1848017aaf750d5c9b14a0c6e122e /src/sbin | |
| parent | 1ef9f2ce0af301cda6f21653def563450eaaf327 (diff) | |
| download | bcfg2-75c6e2ac28a6f406d679a44dc399c5eb6d6d25e1.tar.gz bcfg2-75c6e2ac28a6f406d679a44dc399c5eb6d6d25e1.tar.bz2 bcfg2-75c6e2ac28a6f406d679a44dc399c5eb6d6d25e1.zip | |
made bcfg2-admin accept -Q flag and a few others; general code cleanup
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 6a502afde..5cb69d747 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -41,6 +41,12 @@ def main(): 'configfile': Bcfg2.Options.CFILE, 'help': Bcfg2.Options.HELP, 'verbose': Bcfg2.Options.VERBOSE, + 'repo': Bcfg2.Options.SERVER_REPOSITORY, + 'plugins': Bcfg2.Options.SERVER_PLUGINS, + 'event debug': Bcfg2.Options.DEBUG, + 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR, + 'password': Bcfg2.Options.SERVER_PASSWORD, + 'encoding': Bcfg2.Options.ENCODING, } setup = Bcfg2.Options.OptionParser(optinfo) # override default help message to include description of all modes @@ -74,7 +80,7 @@ def main(): e = sys.exc_info()[1] log.error("Failed to load admin mode %s: %s" % (modname, e)) raise SystemExit(1) - mode = mode_cls(setup['configfile']) + mode = mode_cls(setup) mode(setup['args'][1:]) if hasattr(mode, 'bcore'): mode.bcore.shutdown() |