diff options
| -rw-r--r-- | debian/frr.logrotate | 2 | ||||
| -rw-r--r-- | redhat/frr.logrotate | 8 | ||||
| -rw-r--r-- | tools/etc/frr/daemons | 2 | ||||
| -rw-r--r-- | tools/etc/rsyslog.d/45-frr.conf | 2 | ||||
| -rwxr-xr-x | tools/frr-reload.py | 1 | ||||
| -rwxr-xr-x | tools/frr.in | 2 | ||||
| -rwxr-xr-x | tools/frrcommon.sh.in | 2 |
7 files changed, 16 insertions, 3 deletions
diff --git a/debian/frr.logrotate b/debian/frr.logrotate index 1e0e726cb..735af6539 100644 --- a/debian/frr.logrotate +++ b/debian/frr.logrotate @@ -17,7 +17,7 @@ # open, as well as the daemons, so always signal the daemons. # It's safe, a NOP if (only) syslog is being used. for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd sharpd \ - pimd ripd ripngd zebra pathd pbrd staticd bfdd fabricd vrrpd; do + pimd pim6d ripd ripngd zebra pathd pbrd staticd bfdd fabricd vrrpd; do if [ -e /var/run/frr/$i.pid ] ; then pids="$pids $(cat /var/run/frr/$i.pid)" fi diff --git a/redhat/frr.logrotate b/redhat/frr.logrotate index 04ae96b65..31061e3ae 100644 --- a/redhat/frr.logrotate +++ b/redhat/frr.logrotate @@ -134,6 +134,14 @@ endscript } +/var/log/frr/pim6d.log { + notifempty + missingok + postrotate + /bin/kill -USR1 `cat /var/run/frr/pim6d.pid 2> /dev/null` 2> /dev/null || true + endscript +} + /var/log/frr/sharpd.log { notifempty missingok diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons index 860c4980b..8aa08871e 100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@ -21,6 +21,7 @@ ripd=no ripngd=no isisd=no pimd=no +pim6d=no ldpd=no nhrpd=no eigrpd=no @@ -46,6 +47,7 @@ ripd_options=" -A 127.0.0.1" ripngd_options=" -A ::1" isisd_options=" -A 127.0.0.1" pimd_options=" -A 127.0.0.1" +pim6d_options=" -A ::1" ldpd_options=" -A 127.0.0.1" nhrpd_options=" -A 127.0.0.1" eigrpd_options=" -A 127.0.0.1" diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf index 9da15b9f9..6e14eb7ab 100644 --- a/tools/etc/rsyslog.d/45-frr.conf +++ b/tools/etc/rsyslog.d/45-frr.conf @@ -15,6 +15,7 @@ if $programname == 'babeld' or $programname == 'ospf6d' or $programname == 'ospfd' or $programname == 'pimd' or + $programname == 'pim6d' or $programname == 'pathd' or $programname == 'ripd' or $programname == 'ripngd' or @@ -35,6 +36,7 @@ if $programname == 'babeld' or $programname == 'ospf6d' or $programname == 'ospfd' or $programname == 'pimd' or + $programname == 'pim6d' or $programname == 'pathd' or $programname == 'ripd' or $programname == 'ripngd' or diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 743d32d5e..32f9a7884 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -1886,6 +1886,7 @@ if __name__ == "__main__": "ospfd", "pbrd", "pimd", + "pim6d", "ripd", "ripngd", "sharpd", diff --git a/tools/frr.in b/tools/frr.in index 889c075f8..27b2c0ab8 100755 --- a/tools/frr.in +++ b/tools/frr.in @@ -27,7 +27,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter # Local Daemon selection may be done by using /etc/frr/daemons. # See /usr/share/doc/frr/README.Debian.gz for further information. # Keep zebra first and do not list watchfrr! -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd" +DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd" MAX_INSTANCES=5 RELOAD_SCRIPT="$D_PATH/frr-reload.py" diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 6eb3223fa..759d49837 100755 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -35,7 +35,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter # - keep zebra first # - watchfrr does NOT belong in this list -DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd" +DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd" RELOAD_SCRIPT="$D_PATH/frr-reload.py" # |