lib: don't mkdir state paths in watchfrr

watchfrr doesn't know if there will be -u/-g options on the individual
daemons, so it doesn't know what the appropriate ownership is.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-08-03 06:02:45 +02:00
parent c9c8d0d189
commit b8c1fde3cb

View File

@ -399,12 +399,15 @@ struct thread_master *frr_init(void)
zlog_set_level(ZLOG_DEST_SYSLOG, zlog_default->default_lvl); zlog_set_level(ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
#endif #endif
/* don't mkdir these as root... */
if (!(di->flags & FRR_NO_PRIVSEP)) {
if (!di->pid_file || !di->vty_path) if (!di->pid_file || !di->vty_path)
frr_mkdir(frr_vtydir, false); frr_mkdir(frr_vtydir, false);
if (di->pid_file) if (di->pid_file)
frr_mkdir(di->pid_file, true); frr_mkdir(di->pid_file, true);
if (di->vty_path) if (di->vty_path)
frr_mkdir(di->vty_path, true); frr_mkdir(di->vty_path, true);
}
frrmod_init(di->module); frrmod_init(di->module);
while (modules) { while (modules) {