From: Jarad Olson <brotherdust+github@gmail.com>
Date: Tue, 15 May 2018 17:49:18 +0000 (-0600)
Subject: Change order of MPLS configuration
X-Git-Tag: frr-6.1-dev~436^2~10
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a500c91ad5ca08ca69ef9f02e155c5dc218e11a7;p=matthieu%2Ffrr.git

Change order of MPLS configuration

MPLS kernel modules should be initialized *before* enabling forwarding. Otherwise, errors.

Signed-off-by: Jarad Olson <brotherdust+github@gmail.com>
---

diff --git a/doc/developer/building-frr-on-ubuntu1804.rst b/doc/developer/building-frr-on-ubuntu1804.rst
index 17edb7ef4f..7c65747bd5 100644
--- a/doc/developer/building-frr-on-ubuntu1804.rst
+++ b/doc/developer/building-frr-on-ubuntu1804.rst
@@ -101,6 +101,20 @@ other settings)
     #  based on Router Advertisements for this host
     net.ipv6.conf.all.forwarding=1
 
+Add MPLS kernel modules
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Add the following lines to ``/etc/modules-load.d/modules.conf``:
+
+::
+
+    # Load MPLS Kernel Modules
+    mpls-router
+    mpls-iptunnel
+
+**Reboot** or use ``sysctl -p`` to apply the same config to the running
+system
+
 Enable MPLS Forwarding (with Linux Kernel >= 4.5)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -116,20 +130,6 @@ MPLS
     net.mpls.conf.eth2.input=1
     net.mpls.platform_labels=100000
 
-Add MPLS kernel modules
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Add the following lines to ``/etc/modules-load.d/modules.conf``:
-
-::
-
-    # Load MPLS Kernel Modules
-    mpls-router
-    mpls-iptunnel
-
-**Reboot** or use ``sysctl -p`` to apply the same config to the running
-system
-
 Install the systemd service (if rebooted from last step, change directory back to frr directory)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^