At this point I'm pretty sure that removing the --config options from

daemons was pointless, so back that out before removing branches/tk713.

svn path=/branches/tk705/; revision=5958

1 files changed, 3 insertions, 1 deletions

diff --git a/rpki/pubd.py b/rpki/pubd.py
index fe7987d1..335da0e6 100644
--- a/rpki/pubd.py
+++ b/rpki/pubd.py
@@ -93,6 +93,8 @@ class main(object):
     self.irbe_cms_timestamp = None
 
     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",
@@ -106,7 +108,7 @@ class main(object):
 
     rpki.log.init("pubd", args)
 
-    self.cfg = rpki.config.parser(section = "pubd")
+    self.cfg = rpki.config.parser(set_filename = args.config, section = "pubd")
     self.cfg.set_global_flags()
 
     if not args.foreground: