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

Merge pull request #893 from opensourcerouting/minor-issues

Browse Source 
Fix #875 and #889 (minor issues)
This commit is contained in:
Donald Sharp 2017-08-02 07:59:29 -04:00 committed by GitHub
commit 8618a572ae
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
babeld/babeld.conf.sample
View File

@ -9,8 +9,8 @@ debug babel common
router babel router babel
! network wlan0 ! network wlan0
! network eth0 ! network eth0
! redistribute kernel ! redistribute ipv4 kernel
! no redistribute static ! no redistribute ipv6 static
! The defaults are fine for a wireless interface ! The defaults are fine for a wireless interface

4
doc/babeld.texi
View File

@ -179,8 +179,8 @@ The default is 4@dmn{s}.
@node Babel redistribution, Show Babel information, Babel configuration, Babel @node Babel redistribution, Show Babel information, Babel configuration, Babel
@section Babel redistribution @section Babel redistribution
@deffn {Babel command} {redistribute @var{kind}} @deffn {Babel command} {redistribute @var{<ipv4|ipv6>} @var{kind}}
@deffnx {Babel command} {no redistribute @var{kind}} @deffnx {Babel command} {no redistribute @var{<ipv4|ipv6>} @var{kind}}
Specify which kind of routes should be redistributed into Babel. Specify which kind of routes should be redistributed into Babel.
@end deffn @end deffn

2
lib/subdir.am
View File

@ -251,7 +251,7 @@ GITH=lib/gitversion.h
lib/gitversion.h.tmp: $(top_srcdir)/.git lib/gitversion.h.tmp: $(top_srcdir)/.git
@PERL@ $(top_srcdir)/lib/gitversion.pl $(top_srcdir) > ${GITH}.tmp @PERL@ $(top_srcdir)/lib/gitversion.pl $(top_srcdir) > ${GITH}.tmp
lib/gitversion.h: lib/gitversion.h.tmp lib/gitversion.h: lib/gitversion.h.tmp
{ test -f ${GITH} && diff -s -q ${GITH}.tmp ${GITH}; } || cp -v ${GITH}.tmp ${GITH} { test -f ${GITH} && diff -s -q ${GITH}.tmp ${GITH}; } || cp ${GITH}.tmp ${GITH}
else else
.PHONY: lib/gitversion.h .PHONY: lib/gitversion.h