commit bb83de614083f597c19d27a4eac925197c388349
author Vic Yang <victoryang@chromium.org> Wed Jun 13 02:15:42 2012
committer Gerrit <chrome-bot@google.com> Wed Jun 13 03:13:12 2012
tree d29eb61b990c8607f82cc6bcb5bf7401ebcf28db
parent 8bda7b2707a5dd548b5342a5affbedcf2ea6e498

Set default value for miniomaha server config file

For most cases, we use miniomaha.conf as miniOmaha server configuration file.
Let's set this as the default value.

BUG=chrome-os-partner:10457
TEST=Start miniomaha.py from two different working directories without config
     file specified.

Change-Id: I75bf8cc36908902686b9899d418c6970d524291c
Reviewed-on: https://gerrit.chromium.org/gerrit/25159
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Ready: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>

factory_setup/miniomaha.py

diff --git a/factory_setup/miniomaha.py b/factory_setup/miniomaha.py
index 9f4d3a4..ed721d2 100755
--- a/factory_setup/miniomaha.py
+++ b/factory_setup/miniomaha.py
@@ -126,13 +126,15 @@
 
 
 if __name__ == '__main__':
+  base_path = os.path.dirname(os.path.abspath(sys.argv[0]))
   usage = 'usage: %prog [options]'
   parser = optparse.OptionParser(usage)
   parser.add_option('--data_dir', dest='data_dir',
                     help='Writable directory where static lives',
-                    default=os.path.dirname(os.path.abspath(sys.argv[0])))
+                    default=base_path)
   parser.add_option('--factory_config', dest='factory_config',
-                    help='Config file for serving images from factory floor.')
+                    help='Config file for serving images from factory floor.',
+                    default=base_path + "/miniomaha.conf")
   parser.add_option('--port', default=8080,
                     help='Port for the dev server to use.')
   parser.add_option('--proxy_port', default=None,