diff options
| author | Rob Austein <sra@hactrn.net> | 2014-09-16 18:29:46 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-09-16 18:29:46 +0000 |
| commit | 180a9c09f9705283e11caa2df408e6b2353f3b9d (patch) | |
| tree | a0861ddd006017e9f4fe754bd1abefa36a9a73cb /rpki/rootd.py | |
| parent | c02686daf6dcc4175f119adc5d19261f577b2856 (diff) | |
| parent | 7c2fb9ca36f120369797072e534041daae6cd8f9 (diff) | |
Merge changes from branches/tk713 into branches/tk705. See #705, #713.
svn path=/branches/tk705/; revision=5956
Diffstat (limited to 'rpki/rootd.py')
| -rw-r--r-- | rpki/rootd.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rpki/rootd.py b/rpki/rootd.py index 0508dc49..6b6aa0fa 100644 --- a/rpki/rootd.py +++ b/rpki/rootd.py @@ -428,8 +428,6 @@ class main(object): time.tzset() parser = argparse.ArgumentParser(description = __doc__) - parser.add_argument("-c", "--config", - help = "override default location of configuration file") parser.add_argument("-f", "--foreground", action = "store_true", help = "do not daemonize") parser.add_argument("--pidfile", @@ -439,7 +437,7 @@ class main(object): rpki.log.init("rootd", args) - self.cfg = rpki.config.parser(args.config, "rootd") + self.cfg = rpki.config.parser(section = "rootd") self.cfg.set_global_flags() if not args.foreground: |