diff options
| author | Renato Westphal <renato@openbsd.org> | 2018-12-04 00:30:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 00:30:00 +0100 |
| commit | a1f0a9ac23cc0bcc456e15e5b69f23ad817f8b6e (patch) | |
| tree | 4c75f5a29fdc19676e73500d9b9fdf0181972258 /zebra/main.c | |
| parent | Merge pull request #3404 from donaldsharp/nexthop_cleanup (diff) | |
| parent | zebra: delay default vrf name after vrf initialization (diff) | |
| download | frr-a1f0a9ac23cc0bcc456e15e5b69f23ad817f8b6e.tar.xz frr-a1f0a9ac23cc0bcc456e15e5b69f23ad817f8b6e.zip | |
Merge pull request #3370 from pguibert6WIND/default_vrf_initialization
Default vrf initialization
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/zebra/main.c b/zebra/main.c index 0f1e14821..90d3dbc18 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -259,6 +259,7 @@ int main(int argc, char **argv) { // int batch_mode = 0; char *zserv_path = NULL; + char *vrf_default_name_configured = NULL; /* Socket to external label manager */ char *lblmgr_path = NULL; struct sockaddr_storage dummy; @@ -339,7 +340,7 @@ int main(int argc, char **argv) } break; case 'o': - vrf_set_default_name(optarg); + vrf_default_name_configured = optarg; break; case 'z': zserv_path = optarg; @@ -407,7 +408,9 @@ int main(int argc, char **argv) * Initialize NS( and implicitly the VRF module), and make kernel * routing socket. */ zebra_ns_init(); - + if (vrf_default_name_configured) + vrf_set_default_name(vrf_default_name_configured, + true); zebra_vty_init(); access_list_init(); prefix_list_init(); |