From 8399fd9d36f46ae8f30ea8850b2eb1e50329c2a6 Mon Sep 17 00:00:00 2001
From: Hung-Wei Chiu <hwchiu@users.noreply.github.com>
Date: Thu, 27 Apr 2017 11:10:36 +0800
Subject: [PATCH 1/2] Update Building_FRR_on_Ubuntu1604.md

1.  Modify the configure prefix (since there some hard coded path in **/usr/lib/frr/fr**
2.  Install the systemd service config
---
 doc/Building_FRR_on_Ubuntu1604.md | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md
index b213a90858..b3bcdf9f96 100644
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@ -39,6 +39,7 @@ an example.)
     git checkout stable/2.0
     ./bootstrap.sh
     ./configure \
+        --prefix=/usr \
         --enable-exampledir=/usr/share/doc/frr/examples/ \
         --localstatedir=/var/run/frr \
         --sbindir=/usr/lib/frr \
@@ -111,3 +112,39 @@ Add the following lines to `/etc/modules-load.d/modules.conf`:
     mpls-iptunnel
 
 **Reboot** or use `sysctl -p` to apply the same config to the running system
+
+
+### Install The Systemd Service
+
+    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/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 
+
+Edit `/etc/frr/daemons` and change the value from "no" to "yes" for those daemons you want to start by systemd.  
+For example.
+
+    zebra=yes
+    bgpd=yes
+    ospfd=yes
+    ospf6d=yes
+    ripd=yes
+    ripngd=yes
+    isisd=yes
+
+### Enable the Systemd Serivce
+Edit `/etc/systemd/system/frr.service` and remove the line **OnFailure=heartbeat-failed@%n.service**  
+For example.
+
+    [Unit]  
+    Description=Cumulus Linux FRR  
+    After=syslog.target networking.service  
+    
+### Start the Systemd Service
+- systemctl start frr
+- use `syttemctl status frr` to check its status.

From 8a77d75b8ae54d1f52739d0689933e7a0d90fb72 Mon Sep 17 00:00:00 2001
From: Hung-Wei Chiu <hwchiu@users.noreply.github.com>
Date: Thu, 27 Apr 2017 11:22:15 +0800
Subject: [PATCH 2/2] Update Building_FRR_on_Ubuntu1604.md

Fix typo
---
 doc/Building_FRR_on_Ubuntu1604.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md
index b3bcdf9f96..7848ff68ab 100644
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@ -114,7 +114,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
 
 
-### Install The Systemd Service
+### Install the systemd service
 
     sudo install -m 644 tools/frr.service /etc/systemd/system/frr.service  
     sudo install -m 644 cumulus/etc/default/frr /etc/default/frr  
@@ -123,8 +123,7 @@ Add the following lines to `/etc/modules-load.d/modules.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 
+### Enable daemons 
 
 Edit `/etc/frr/daemons` and change the value from "no" to "yes" for those daemons you want to start by systemd.  
 For example.
@@ -137,7 +136,7 @@ For example.
     ripngd=yes
     isisd=yes
 
-### Enable the Systemd Serivce
+### Enable the systemd serivce
 Edit `/etc/systemd/system/frr.service` and remove the line **OnFailure=heartbeat-failed@%n.service**  
 For example.
 
@@ -145,6 +144,6 @@ For example.
     Description=Cumulus Linux FRR  
     After=syslog.target networking.service  
     
-### Start the Systemd Service
+### Start the systemd service
 - systemctl start frr
-- use `syttemctl status frr` to check its status.
+- use `systemctl status frr` to check its status.