diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/vnet_generate | 1 | ||||
| -rwxr-xr-x | util/vnet_run | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/util/vnet_generate b/util/vnet_generate index 8cfb417..01f7163 100755 --- a/util/vnet_generate +++ b/util/vnet_generate @@ -190,6 +190,7 @@ class Node(): print(f"Warning: multiple routers found for host {self.name}, selecting one") default_router, default_iface = routers[0] default_ip, _ = default_router.get_ip_on_network(default_iface.network) + fd.write("routing static\n\n") fd.write("# Default route\n") fd.write("route 0.0.0.0/0 via {}\n".format(default_ip)) else: 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) |