summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2017-05-16 17:55:58 +0200
committerGitHub <noreply@github.com>2017-05-16 17:55:58 +0200
commit9b938b384c13440670ac77de47b39a1f53b7bdc9 (patch)
tree2a37d0c74faefe5c4c09f7a065f82bf7b8a66488
parent291012893e1a3d4caec2bd9da54245edf042110a (diff)
parent9bcb88c7bfc063e3f78965921e1ac0669e503c3f (diff)
Merge pull request #492 from dwalton76/stable/2.0
Change Frr.conf to frr.conf
-rw-r--r--cumulus/etc/frr/frr.conf (renamed from cumulus/etc/frr/Frr.conf)0
-rw-r--r--doc/Building_FRR_on_Ubuntu1604.md2
2 files changed, 1 insertions, 1 deletions
diff --git a/cumulus/etc/frr/Frr.conf b/cumulus/etc/frr/frr.conf
index 2cd05bf803..2cd05bf803 100644
--- a/cumulus/etc/frr/Frr.conf
+++ b/cumulus/etc/frr/frr.conf
diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md
index 7848ff68ab..2d5b57ed56 100644
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@ -120,7 +120,7 @@ Add the following lines to `/etc/modules-load.d/modules.conf`:
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/Frr.conf /etc/frr/Frr.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
### Enable daemons