proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 18:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: Add pim6d to tools so that pim6d will work properly

Browse Source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-08-05 08:14:06 -04:00
parent 9bbf785892
commit 5651da2461
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/frr.logrotate vendored
View File

@ -17,7 +17,7 @@
# open, as well as the daemons, so always signal the daemons. # open, as well as the daemons, so always signal the daemons.
# It's safe, a NOP if (only) syslog is being used. # It's safe, a NOP if (only) syslog is being used.
for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd sharpd \ 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 if [ -e /var/run/frr/$i.pid ] ; then
pids="$pids $(cat /var/run/frr/$i.pid)" pids="$pids $(cat /var/run/frr/$i.pid)"
fi fi

8
redhat/frr.logrotate
View File

@ -134,6 +134,14 @@
endscript 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 { /var/log/frr/sharpd.log {
notifempty notifempty
missingok missingok

2
tools/etc/frr/daemons
View File

@ -21,6 +21,7 @@ ripd=no
ripngd=no ripngd=no
isisd=no isisd=no
pimd=no pimd=no
pim6d=no
ldpd=no ldpd=no
nhrpd=no nhrpd=no
eigrpd=no eigrpd=no
@ -46,6 +47,7 @@ ripd_options=" -A 127.0.0.1"
ripngd_options=" -A ::1" ripngd_options=" -A ::1"
isisd_options=" -A 127.0.0.1" isisd_options=" -A 127.0.0.1"
pimd_options=" -A 127.0.0.1" pimd_options=" -A 127.0.0.1"
pim6d_options=" -A ::1"
ldpd_options=" -A 127.0.0.1" ldpd_options=" -A 127.0.0.1"
nhrpd_options=" -A 127.0.0.1" nhrpd_options=" -A 127.0.0.1"
eigrpd_options=" -A 127.0.0.1" eigrpd_options=" -A 127.0.0.1"

2
tools/etc/rsyslog.d/45-frr.conf
View File

@ -15,6 +15,7 @@ if $programname == 'babeld' or
$programname == 'ospf6d' or $programname == 'ospf6d' or
$programname == 'ospfd' or $programname == 'ospfd' or
$programname == 'pimd' or $programname == 'pimd' or
$programname == 'pim6d' or
$programname == 'pathd' or $programname == 'pathd' or
$programname == 'ripd' or $programname == 'ripd' or
$programname == 'ripngd' or $programname == 'ripngd' or
@ -35,6 +36,7 @@ if $programname == 'babeld' or
$programname == 'ospf6d' or $programname == 'ospf6d' or
$programname == 'ospfd' or $programname == 'ospfd' or
$programname == 'pimd' or $programname == 'pimd' or
$programname == 'pim6d' or
$programname == 'pathd' or $programname == 'pathd' or
$programname == 'ripd' or $programname == 'ripd' or
$programname == 'ripngd' or $programname == 'ripngd' or

1
tools/frr-reload.py
View File

@ -1886,6 +1886,7 @@ if __name__ == "__main__":
"ospfd", "ospfd",
"pbrd", "pbrd",
"pimd", "pimd",
"pim6d",
"ripd", "ripd",
"ripngd", "ripngd",
"sharpd", "sharpd",

2
tools/frr.in
View File

@ -27,7 +27,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter
# Local Daemon selection may be done by using /etc/frr/daemons. # Local Daemon selection may be done by using /etc/frr/daemons.
# See /usr/share/doc/frr/README.Debian.gz for further information. # See /usr/share/doc/frr/README.Debian.gz for further information.
# Keep zebra first and do not list watchfrr! # 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 MAX_INSTANCES=5
RELOAD_SCRIPT="$D_PATH/frr-reload.py" RELOAD_SCRIPT="$D_PATH/frr-reload.py"

2
tools/frrcommon.sh.in
View File

@ -35,7 +35,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter
# - keep zebra first # - keep zebra first
# - watchfrr does NOT belong in this list # - 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" RELOAD_SCRIPT="$D_PATH/frr-reload.py"
# #