]> git.proxmox.com Git - mirror_frr.git/commitdiff
redhat: Disallow reload function for unsupported systems
authorMartin Winter <mwinter@opensourcerouting.org>
Mon, 22 May 2017 11:07:22 +0000 (04:07 -0700)
committerMartin Winter <mwinter@opensourcerouting.org>
Mon, 22 May 2017 11:07:22 +0000 (04:07 -0700)
Before the change, a reload triggered a restart if the python reload script wasn't installed or for non-integrated configs
With this change, the reload is rejected with an error in this case (and suggests the installation of the python script package)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
redhat/frr.init

index ba3731e777ad33fbac41733a85eabf04afb034c0..96c0a833afab4ad1641c638252a6897d1dbe0a2d 100755 (executable)
@@ -524,15 +524,13 @@ case "$1" in
     reload)
         # Just apply the commands that have changed, no restart necessary
         if [ ! -x "$RELOAD_SCRIPT" ]; then
-            echo "frr-reload script not installed - Executing full restart instead"
-            $0 restart
-            exit $?
+            echo "frr-reload - reload not supported. Use restart or install frr-pythontools package"
+            exit 1
         fi
         NEW_CONFIG_FILE="${2:-$C_PATH/frr.conf}"
         if [ ! -r $NEW_CONFIG_FILE ]; then
-            echo "Unable to read configuration file $NEW_CONFIG_FILE. Only supporting integrated config - Executing full restart instead"
-            $0 restart
-            exit $?
+            echo "Unable to read configuration file $NEW_CONFIG_FILE. Only supporting integrated config"
+            exit 1
         fi
         echo "Applying only incremental changes to running configuration from frr.conf"
         "$RELOAD_SCRIPT" --reload /etc/frr/frr.conf