diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2017-05-08 22:00:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 22:00:09 +0200 |
| commit | f86528340cc4cb7146d1628d355847f0fed0f440 (patch) | |
| tree | ec0c7266bcdbb869d87504b48a6793c94fe1ea29 /doc | |
| parent | Merge pull request #477 from opensourcerouting/gitignore (diff) | |
| parent | Merge remote-tracking branch 'origin/master' into datacenter (diff) | |
| download | frr-f86528340cc4cb7146d1628d355847f0fed0f440.tar.xz frr-f86528340cc4cb7146d1628d355847f0fed0f440.zip | |
Merge pull request #464 from donaldsharp/datacenter
Datacenter
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Building_FRR_on_Ubuntu1204.md | 2 | ||||
| -rw-r--r-- | doc/Building_FRR_on_Ubuntu1404.md | 2 | ||||
| -rw-r--r-- | doc/Building_FRR_on_Ubuntu1604.md | 2 | ||||
| -rw-r--r-- | doc/install.texi | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/doc/Building_FRR_on_Ubuntu1204.md b/doc/Building_FRR_on_Ubuntu1204.md index 521f0a0c2..033e05bcd 100644 --- a/doc/Building_FRR_on_Ubuntu1204.md +++ b/doc/Building_FRR_on_Ubuntu1204.md @@ -136,7 +136,7 @@ other settings) sudo install -m 755 tools/frr /etc/init.d/frr sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons - sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf + sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf ### Enable daemons diff --git a/doc/Building_FRR_on_Ubuntu1404.md b/doc/Building_FRR_on_Ubuntu1404.md index 2c5f132ad..11daecf19 100644 --- a/doc/Building_FRR_on_Ubuntu1404.md +++ b/doc/Building_FRR_on_Ubuntu1404.md @@ -96,7 +96,7 @@ other settings) sudo install -m 755 tools/frr /etc/init.d/frr sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons - sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf + sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md index 327b7d68a..8b8bbf4bb 100644 --- a/doc/Building_FRR_on_Ubuntu1604.md +++ b/doc/Building_FRR_on_Ubuntu1604.md @@ -118,7 +118,7 @@ Add the following lines to `/etc/modules-load.d/modules.conf`: sudo install -m 644 tools/frr.service /etc/systemd/system/frr.service sudo install -m 644 cumulus/etc/default/frr /etc/default/frr sudo install -m 644 cumulus/etc/frr/daemons /etc/frr/daemons - sudo install -m 644 cumulus/etc/frr/debian.conf /etc/frr/debian.conf + sudo install -m 644 cumulus/etc/frr/daemons.conf /etc/frr/daemons.conf sudo install -m 644 cumulus/etc/frr/Frr.conf /etc/frr/Frr.conf sudo install -m 644 -o frr -g frr cumulus/etc/frr/vtysh.conf /etc/frr/vtysh.conf diff --git a/doc/install.texi b/doc/install.texi index d989928b8..9a98f4673 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -63,6 +63,9 @@ Do not build bgpd. @item --disable-bgp-announce Make @command{bgpd} which does not make bgp announcements at all. This feature is good for using @command{bgpd} as a BGP announcement listener. +@item --enable-datacenter +Enable system defaults to work as if in a Data Center. See defaults.h +for what is changed by this configure option. @item --enable-snmp Enable SNMP support. By default, SNMP support is disabled. @item --disable-ospfapi |