zebra: Move NS/VRF initialization earlier

Move the NS/VRF initialization code for zebra to an earlier
point in startup.  In the future we will have code that
will want to install_element into a VRF_NODE from zebra_vty.c

Signed-off-by: Donald Sharp <sahrpd@cumulusnetworks.com>

diff --git a/zebra/main.c b/zebra/main.c
index e26c8e3d6969a7a9bedfb0fd7ef3a0252177077f..19b16936d9e08900f00351249b8f5dc2eac4f568 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -300,6 +300,13 @@ int main(int argc, char **argv)
        zebra_if_init();
        zebra_debug_init();
        router_id_cmd_init();
+
+       /*
+        * Initialize NS( and implicitly the VRF module), and make kernel
+        * routing socket. */
+       zebra_ns_init();
+
+       zebra_vty_init();
        access_list_init();
        prefix_list_init();
 #if defined(HAVE_RTADV)
@@ -317,16 +324,6 @@ int main(int argc, char **argv)
        /* For debug purpose. */
        /* SET_FLAG (zebra_debug_event, ZEBRA_DEBUG_EVENT); */
 
-       /* Initialize NS( and implicitly the VRF module), and make kernel
-        * routing socket. */
-       zebra_ns_init();
-
-       /*
-        * Initialize show/config command after the vrf initialization is
-        * complete
-        */
-       zebra_vty_init();
-
 #if defined(HANDLE_ZAPI_FUZZING)
        if (fuzzing) {
                zserv_read_file(fuzzing);