summaryrefslogtreecommitdiffstats
path: root/doc/developer/building-frr-on-ubuntu1804.rst
diff options
context:
space:
mode:
authorJarad Olson <brotherdust+github@gmail.com>2018-05-15 20:04:48 +0200
committerJarad Olson <brotherdust+github@gmail.com>2018-05-15 20:04:48 +0200
commitbd938314384005118b9cd4a7c712836fe58f5f57 (patch)
treec0f338827110936a1d2458aa4d4d8a844039530d /doc/developer/building-frr-on-ubuntu1804.rst
parentFixup code block formatting errors (diff)
downloadfrr-bd938314384005118b9cd4a7c712836fe58f5f57.tar.xz
frr-bd938314384005118b9cd4a7c712836fe58f5f57.zip
Re-worded information on MPLS support in 18.04
Signed-off-by: Jarad Olson <brotherdust+github@gmail.com>
Diffstat (limited to '')
-rw-r--r--doc/developer/building-frr-on-ubuntu1804.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/developer/building-frr-on-ubuntu1804.rst b/doc/developer/building-frr-on-ubuntu1804.rst
index 2efa1e655..a117a82e0 100644
--- a/doc/developer/building-frr-on-ubuntu1804.rst
+++ b/doc/developer/building-frr-on-ubuntu1804.rst
@@ -170,7 +170,8 @@ other settings)
Add MPLS kernel modules
^^^^^^^^^^^^^^^^^^^^^^^
-Add the following lines to ``/etc/modules-load.d/modules.conf``:
+Ubuntu 18.04 ships with kernel 4.15. MPLS modules are present by default.
+To enable, add the following lines to ``/etc/modules-load.d/modules.conf``:
::
@@ -181,7 +182,7 @@ Add the following lines to ``/etc/modules-load.d/modules.conf``:
**Reboot** or use ``sysctl -p`` to apply the same config to the running
system
-Enable MPLS Forwarding (with Linux Kernel >= 4.5)
+Enable MPLS Forwarding
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Edit ``/etc/sysctl.conf`` and the following lines. Make sure to add a