From a5f57ca1647c2edf5c56b5b7e889128f4c80d621 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Sat, 3 Feb 2024 22:43:58 +0200 Subject: [PATCH] mgmtd: disable lib code for config reading mgmtd reads config files on its own, it doesn't need libfrr to do that. It already doesn't do that, because mgmtd uses di->read_in thread for config reading and libfrr doesn't reschedule the tread, so this commit just removes the dead code. Signed-off-by: Igor Ryzhov --- mgmtd/mgmt_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c index 5be849b63c41..1942949b1d07 100644 --- a/mgmtd/mgmt_main.c +++ b/mgmtd/mgmt_main.c @@ -48,7 +48,6 @@ struct zebra_privs_t mgmt_privs = { }; static struct frr_daemon_info mgmtd_di; -char backup_config_file[256]; /* SIGHUP handler. */ static void sighup(void) @@ -212,7 +211,7 @@ FRR_DAEMON_INFO(mgmtd, MGMTD, .n_yang_modules = array_size(mgmt_yang_modules), /* avoid libfrr trying to read our config file for us */ - .flags = FRR_MANUAL_VTY_START, + .flags = FRR_MANUAL_VTY_START | FRR_NO_SPLIT_CONFIG, ); /* clang-format on */ @@ -274,11 +273,6 @@ int main(int argc, char **argv) /* MGMTD related initialization. */ mgmt_init(); - snprintf(backup_config_file, sizeof(backup_config_file), - "%s/zebra.conf", frr_sysconfdir); - mgmtd_di.backup_config_file = backup_config_file; - - /* this will queue a read configs event */ frr_config_fork(); frr_run(mm->master);