*: fix some user-visible Quagga remnants

(Note: the allow_delete thing is called "zebra" on the commandline
because that's the clearest context there, while it is called "FRR" in
the CLI because that's considerably less confusing in a vtysh env.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/log.h b/lib/log.h
index 8a65bbbf51ef67b0acbf850785819f99e159bac5..cc419cc374ac40504d5fae1cc9326d20960cce62 100644 (file)
--- a/lib/log.h
+++ b/lib/log.h
@@ -153,8 +153,6 @@ struct timestamp_control {
    char buf[QUAGGA_TIMESTAMP_LEN];     /* will contain the rendered timestamp */
 };
 
-#define LOG_DEFAULT_FILENAME "/var/log/quagga/Quagga.log"
-
 /* Defines for use in command construction: */
 
 #define LOG_LEVEL_DESC \

diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index ba1c511d164ea9c391f690c4a9956eb3aefc79fc..a0e42aab583c0e851f326deb27cd36ea254521dd 100644 (file)
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -113,9 +113,6 @@ int main(int argc, char** argv, char** envp) {
 
   master = frr_init();
 
-  zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting",
-             FRR_VERSION, PIMD_VERSION);
-
   /* 
    * Initializations
    */

diff --git a/zebra/main.c b/zebra/main.c
index b70ce7eda7fc52617c5bb21574c93cd8f164ad47..98177a423e5bfacdf363c03b9482d2aefd283b8d 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -229,7 +229,7 @@ main (int argc, char **argv)
 #endif
        , longopts,
        "  -b, --batch        Runs in batch mode\n"
-       "  -a, --allow_delete Allow other processes to delete Quagga Routes\n"
+       "  -a, --allow_delete Allow other processes to delete zebra routes\n"
        "  -F, --fpm_format   Set fpm format to 'netlink' or 'protobuf'\n"
        "  -z, --socket       Set path of zebra socket\n"
        "  -e, --ecmp         Specify ECMP to use.\n"

diff --git a/zebra/test_main.c b/zebra/test_main.c
index a80b4c87c408c3e94404e47e172a0e319f5535c6..f3ef3df96ab87ef8b1aebc6876f29210c5bcffeb 100644 (file)
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -100,7 +100,7 @@ usage (char *progname, int status)
              "redistribution between different routing protocols.\n\n"\
              "-b, --batch        Runs in batch mode\n"\
              "-d, --daemon       Runs in daemon mode\n"\
-             "-a, --allow_delete Allow other processes to delete Quagga Routes\n" \
+             "-a, --allow_delete Allow other processes to delete zebra routes\n" \
              "-f, --config_file  Set configuration file name\n"\
              "-A, --vty_addr     Set vty's bind address\n"\
              "-P, --vty_port     Set vty's port number\n"\

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index ddb037335cec0337a2725da5f9a4e8516cc89b78..7946089aea3604fa1ca0e08f557db63acbb4d8d3 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3825,7 +3825,7 @@ static_config_ipv6 (struct vty *vty)
 DEFUN (allow_external_route_update,
        allow_external_route_update_cmd,
        "allow-external-route-update",
-       "Allow Quagga routes to be overwritten by external processes")
+       "Allow FRR routes to be overwritten by external processes")
 {
   allow_delete = 1;
 
@@ -3835,7 +3835,7 @@ DEFUN (allow_external_route_update,
 DEFUN (no_allow_external_route_update,
        no_allow_external_route_update_cmd,
        "no allow-external-route-update",
-       "Allow Quagga routes to be overwritten by external processes")
+       "Allow FRR routes to be overwritten by external processes")
 {
   allow_delete = 0;