Merge branch 'stable/2.0'

Fixed minor conflicts from "defaults" change on stable.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

6 files changed, 19 insertions, 25 deletions

diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am
index 15813be72..8cc4e0b4c 100644
--- a/snapcraft/Makefile.am
+++ b/snapcraft/Makefile.am
@@ -1,11 +1,5 @@
 EXTRA_DIST = snapcraft.yaml \
-   scripts/Makefile scripts/zebra-service scripts/bgpd-service \
-   scripts/isisd-service scripts/ripd-service scripts/ripngd-service \
-   scripts/ospf6d-service scripts/ospfd-service \
-   scripts/isisd-service scripts/pimd-service \
-   scripts/ldpd-service \
-   defaults/bgpd.conf.default defaults/isisd.conf.default \
-   defaults/ospf6d.conf.default defaults/ospfd.conf.default \
-   defaults/pimd.conf.default defaults/zebra.conf.default \
-   defaults/ripd.conf.default defaults/ripngd.conf.default \
-   defaults/ldpd.conf.default defaults/vtysh.conf.default
+   README.* \
+   scripts/Makefile scripts/*-service \
+   defaults/*.conf.default \
+   helpers snap
diff --git a/snapcraft/README.snap_build.md b/snapcraft/README.snap_build.md
index 341b210f7..c4db51bd6 100644
--- a/snapcraft/README.snap_build.md
+++ b/snapcraft/README.snap_build.md
@@ -1,4 +1,4 @@
-Building your own FreeRangeRouting Snap
+Building your own FRRouting Snap
 ========================================
 (Tested on Ubuntu 16.04 with Snap Version 2, does not work on Ubuntu 15.x
 which uses earlier versions of snaps)
@@ -7,9 +7,9 @@ which uses earlier versions of snaps)
 
         sudo apt-get install snapcraft
 	
-2. Checkout FreeRangeRouting under a **unpriviledged** user account
+2. Checkout FRRouting under a **unpriviledged** user account
 
-        git clone https://github.com/freerangerouting/frr.git
+        git clone https://github.com/frrouting/frr.git
         cd frr
 
 3. Run Bootstrap and make distribution tar.gz
@@ -56,8 +56,8 @@ The Snap will be auto-started and running.
 Operations
 ==========
 
-### FreeRangeRouting Daemons
-At this time, all FreeRangeRouting daemons are auto-started.
+### FRRouting Daemons
+At this time, all FRRouting daemons are auto-started.
 
 A daemon can be stopped/started with (ie ospf6d)
 
@@ -69,7 +69,7 @@ or disabled/enabled with
     systemctl disable snap.frr.ospf6d.service
     systemctl enable snap.frr.ospf6d.service
 
-### FreeRangeRouting Commands
+### FRRouting Commands
 All the commands are prefixed with frr.
 
     frr.vtysh       -> vtysh
diff --git a/snapcraft/README.usage.md b/snapcraft/README.usage.md
index 2d2b32b6b..aaff59438 100644
--- a/snapcraft/README.usage.md
+++ b/snapcraft/README.usage.md
@@ -1,14 +1,14 @@
-Using the FreeRangeRouting Snap
+Using the FRRouting Snap
 ===============================
 
 After installing the Snap, the priviledged plug need to be connected:
 
     snap connect frr:network-control ubuntu-core:network-control
 
-Enabling/Disabling FreeRangeRouting Daemons
+Enabling/Disabling FRRouting Daemons
 -------------------------------------------
 
-By default (at this time), all FreeRangeRouting daemons will be enabled
+By default (at this time), all FRRouting daemons will be enabled
 on installation. If you want to disable a specific daemon, then use 
 the systemctl commands
 
@@ -24,7 +24,7 @@ Commands defined by this snap
 -----------------------------
 
 - `frr.vtysh`:
-	FreeRangeRouting VTY Shell (configuration tool)
+	FRRouting VTY Shell (configuration tool)
 - `frr.version`:
 	Returns output of `zebra --version` to display version and configured 
 	options
@@ -62,10 +62,10 @@ FAQ
 Sourcecode available
 ====================
 
-The source for this SNAP is available as part of the FreeRangeRouting
+The source for this SNAP is available as part of the FRRouting
 Source Code Distribution. 
 
-    https://github.com/freerangerouting/frr.git
+    https://github.com/frrouting/frr.git
 
 Instructions for rebuilding the snap are in `README.snap_build.md`
 
diff --git a/snapcraft/setup/gui/icon.png b/snapcraft/setup/gui/icon.png
deleted file mode 100644
index e8f68e6dd..000000000
--- a/snapcraft/setup/gui/icon.png
+++ /dev/null
diff --git a/snapcraft/snap/gui/icon.png b/snapcraft/snap/gui/icon.png
new file mode 100644
index 000000000..3ab3f8fc1
--- /dev/null
+++ b/snapcraft/snap/gui/icon.png
diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index a703766f0..a20a1d039 100644
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -1,11 +1,11 @@
 name: frr
 version: @VERSION@
-summary: FreeRangeRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP routing daemon
+summary: FRRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP routing daemon
 description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM routing daemon
- FreeRangeRouting (FRR) is free software which manages TCP/IP based routing 
+ FRRouting (FRR) is free software which manages TCP/IP based routing 
  protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, 
  RIPng, PIM and LDP as well as the IPv6 versions of these.
- FreeRangeRouting (frr) is a fork of Quagga.
+ FRRouting (frr) is a fork of Quagga.
 confinement: strict
 grade: devel