proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-04 06:38:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11751 from donaldsharp/pim6d_tools_fixup

Browse Source 
tools: Add pim6d to tools so that pim6d will work properly
This commit is contained in:
mobash-rasool 2022-08-06 20:21:20 +05:30 committed by GitHub
commit 351d6203a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.
# 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

8
redhat/frr.logrotate
View File

@ -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

2
tools/etc/frr/daemons
View File

@ -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"

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

@ -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

1
tools/frr-reload.py
View File

@ -1886,6 +1886,7 @@ if __name__ == "__main__":
"ospfd",
"pbrd",
"pimd",
"pim6d",
"ripd",
"ripngd",
"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.
# 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"

2
tools/frrcommon.sh.in
View File

@ -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"
#