Merge remote-tracking 'frr/master' into SR-Routing

1 files changed, 7 insertions, 10 deletions

diff --git a/zebra/main.c b/zebra/main.c
index e26c8e3d69..19b16936d9 100644
--- 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);