-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
vtysh: respect --disable-daemon configure flags #7198
Conversation
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Don't install nodes for daemons that are disabled by configure flags. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/ca799145ab3d0e2130149687a5f96910/raw/72a4c0748bafcd921e178131556849e5688636ee/cr_7198_1601377630.diff | git apply
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 9993e7335..c38379c9e 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1978,11 +1978,11 @@ DEFUNSH(VTYSH_PBRD, vtysh_pbr_map, vtysh_pbr_map_cmd,
}
DEFSH(VTYSH_PBRD, vtysh_no_pbr_map_cmd, "no pbr-map PBRMAP [seq (1-700)]",
- NO_STR
- "Delete pbr-map\n"
- "The name of the PBR MAP\n"
- "Sequence to delete from existing pbr-map entry\n"
- "Sequence number\n")
+ NO_STR
+ "Delete pbr-map\n"
+ "The name of the PBR MAP\n"
+ "Sequence to delete from existing pbr-map entry\n"
+ "Sequence number\n")
#endif /* HAVE_PBRD */
#if HAVE_BFDD > 0
@@ -4195,7 +4195,7 @@ void vtysh_init_vty(void)
install_element(VRF_NODE, &vtysh_end_all_cmd);
install_element(VRF_NODE, &vtysh_exit_vrf_cmd);
install_element(VRF_NODE, &vtysh_quit_vrf_cmd);
-
+
install_node(&rmap_node);
install_element(CONFIG_NODE, &vtysh_route_map_cmd);
install_element(RMAP_NODE, &vtysh_exit_rmap_cmd);
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-14426/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings
Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build:
Ubuntu 18.04 arm8 build: Successful with additional warningsDebian Package lintian failed for Ubuntu 18.04 arm8 build:
Ubuntu 18.04 amd64 build: Successful with additional warningsDebian Package lintian failed for Ubuntu 18.04 amd64 build:
Ubuntu 18.04 ppc64le build: Successful with additional warningsDebian Package lintian failed for Ubuntu 18.04 ppc64le build:
Debian 9 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 9 amd64 build:
Ubuntu 18.04 arm7 build: Successful with additional warningsDebian Package lintian failed for Ubuntu 18.04 arm7 build:
|
Don't install nodes for daemons that are disabled by configure flags.