From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 1 Sep 2015 16:58:50 +0000 (-0700)
Subject: 'service quagga reload' is no longer experimental
X-Git-Tag: frr-2.0-rc1~1271^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=18b7046a9382a430d6db73d2c1abd2d87cccc569;p=matthieu%2Ffrr.git

'service quagga reload' is no longer experimental

Ticket: CM-7305
Reviewed By: sharpd@cumulusnetworks.co
Testing Done:
---

diff --git a/debian/quagga.default b/debian/quagga.default
index ae1ae129ef..687ead4f0f 100644
--- a/debian/quagga.default
+++ b/debian/quagga.default
@@ -1,4 +1,2 @@
 MAX_INSTANCES=5
-ENABLE_RELOAD=no
 MAX_FDS=1024
-
diff --git a/debian/quagga.init.d b/debian/quagga.init.d
index 51bf49039b..3e745dfc81 100755
--- a/debian/quagga.init.d
+++ b/debian/quagga.init.d
@@ -518,10 +518,6 @@ case "$1" in
 
     reload)
 	# Just apply the commands that have changed, no restart necessary
-        if [ -z "$ENABLE_RELOAD" ] || [ "$ENABLE_RELOAD" != "yes" ]; then
-            echo "Reload is an experimental feature. Set ENABLE_RELOAD to yes in /etc/default/quagga."
-            exit 1
-        fi
 	[ ! -x "$RELOAD_SCRIPT" ] && echo "quagga-reload script not available" && exit 0
 	NEW_CONFIG_FILE="${2:-$C_PATH/Quagga.conf}"
 	[ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1