summaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-07-30 17:41:04 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-08-01 17:47:56 +0900
commit193a0496c19766b17dffbb10e0f9d7123e66ad2d (patch)
tree4dcde8de727d709c13f93d7f74e18b8635655f0b /bin
parentf7219a77df6711fca7374119bfc56ac2e13eefbd (diff)
use d2to1 and pbr for packaging
- distutils2-like setup.cfg files for a package's metadata - avoid absolute '/etc/ryu/' path for our config file Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ryu-manager6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index 62188dea..cc1ea747 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -53,7 +53,11 @@ CONF.register_cli_opts([
def main():
- CONF(project='ryu', version='ryu-manager %s' % version)
+ try:
+ CONF(project='ryu', version='ryu-manager %s' % version,
+ default_config_files=['/usr/local/etc/ryu/ryu.conf'])
+ except cfg.ConfigFilesNotFoundError:
+ CONF(project='ryu', version='ryu-manager %s' % version)
log.init_log()