aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNicholas DeMarinis <ndemarinis@wpi.edu>2023-10-22 19:47:15 -0400
committerNicholas DeMarinis <ndemarinis@wpi.edu>2023-10-22 19:47:15 -0400
commit7d5495f1fc6fd72620ff7dd66fe08c89d988ffd0 (patch)
tree18277dfc903415c9f9395c841165dbcf8a0d871f /util
parent18216d38bd73c253e6544a88607a9eb2c0bf7e9d (diff)
Updated vnet_run to correctly parse --host and --router.
Diffstat (limited to 'util')
-rwxr-xr-xutil/vnet_run8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/vnet_run b/util/vnet_run
index 39d72a6..628ba62 100755
--- a/util/vnet_run
+++ b/util/vnet_run
@@ -165,15 +165,15 @@ def main(input_args):
if args.bin_config:
bin_info = BinManager.from_bin_config(args.bin_config)
else:
- if args.bin_dir:
- host_bin = pathlib.Path(args.bin_dir).resolve() / VHOST_BINARY_NAME
- router_bin = pathlib.Path(args.bin_dir).resolve() / VROUTER_BINARY_NAME
- else:
+ if (args.router != "") or (args.host != ""):
if args.router == "" or args.host == "":
do_exit("Must specify host and router binaries with --bin-dir or (--host and --router)")
router_bin = pathlib.Path(args.router).resolve()
host_bin = pathlib.Path(args.host).resolve()
+ else:
+ host_bin = pathlib.Path(args.bin_dir).resolve() / VHOST_BINARY_NAME
+ router_bin = pathlib.Path(args.bin_dir).resolve() / VROUTER_BINARY_NAME
check_bin_exists(router_bin)
check_bin_exists(host_bin)