diff options
| -rw-r--r-- | lib/log.h | 2 | ||||
| -rw-r--r-- | pimd/pim_main.c | 3 | ||||
| -rw-r--r-- | zebra/main.c | 2 | ||||
| -rw-r--r-- | zebra/test_main.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 4 |
5 files changed, 4 insertions, 9 deletions
@@ -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 ba1c511d16..a0e42aab58 100644 --- 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 b70ce7eda7..98177a423e 100644 --- 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 a80b4c87c4..f3ef3df96a 100644 --- 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 ddb037335c..7946089aea 100644 --- 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; |