From bd938314384005118b9cd4a7c712836fe58f5f57 Mon Sep 17 00:00:00 2001 From: Jarad Olson Date: Tue, 15 May 2018 12:04:48 -0600 Subject: [PATCH] Re-worded information on MPLS support in 18.04 Signed-off-by: Jarad Olson --- doc/developer/building-frr-on-ubuntu1804.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/developer/building-frr-on-ubuntu1804.rst b/doc/developer/building-frr-on-ubuntu1804.rst index 2efa1e655d..a117a82e0c 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 -- 2.39.5