Merge branch 'queue/osr/vtysh-generic'

WARNING: Merge contains nontrivial fixups in vrf_cmd handling.

Conflicts:
	lib/if.c
	zebra/interface.c

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/if.c b/lib/if.c
index 3ae08abf56..128fc675c1 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -827,6 +827,17 @@ DEFUN_NOSH (no_interface,
   return CMD_SUCCESS;
 }
 
+void
+if_cmd_init (void)
+{
+  install_element (CONFIG_NODE, &interface_cmd);
+  install_element (CONFIG_NODE, &no_interface_cmd);
+
+  install_default (INTERFACE_NODE);
+  install_element (INTERFACE_NODE, &interface_desc_cmd);
+  install_element (INTERFACE_NODE, &no_interface_desc_cmd);
+}
+
 /* For debug purpose. */
 DEFUN (show_address,
        show_address_cmd,