arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Fixes conflicting argument vs config file option.

Browse Source
This commit is contained in:
grossmj 2016-06-16 12:03:48 -06:00
parent a289c9c685
commit ba05ca029e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/run.py
View File

@ -102,7 +102,6 @@ def parse_arguments(argv):
parser.add_argument("--log", help="send output to logfile instead of console") parser.add_argument("--log", help="send output to logfile instead of console")
parser.add_argument("--daemon", action="store_true", help="start as a daemon") parser.add_argument("--daemon", action="store_true", help="start as a daemon")
parser.add_argument("--pid", help="store process pid") parser.add_argument("--pid", help="store process pid")
parser.add_argument("--serverdiscovery", action="store_true", help="allows the server to be discovered on the network via broadcast or multicast on 239.42.42.1")
args = parser.parse_args(argv) args = parser.parse_args(argv)
if args.config: if args.config:
@ -144,7 +143,6 @@ def set_config(args):
server_config["record"] = args.record server_config["record"] = args.record
server_config["debug"] = str(args.debug) server_config["debug"] = str(args.debug)
server_config["shell"] = str(args.shell) server_config["shell"] = str(args.shell)
server_config["server_discovery"] = str(args.serverdiscovery)
config.set_section_config("Server", server_config) config.set_section_config("Server", server_config)