From 7d5495f1fc6fd72620ff7dd66fe08c89d988ffd0 Mon Sep 17 00:00:00 2001 From: Nicholas DeMarinis Date: Sun, 22 Oct 2023 19:47:15 -0400 Subject: Updated vnet_run to correctly parse --host and --router. --- util/vnet_run | 8 ++++---- 1 file 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) -- cgit v1.2.3-70-g09d2