proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

redhat: Disallow reload function for unsupported systems

Browse Source 
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>
This commit is contained in:
Martin Winter 2017-05-22 04:07:22 -07:00 committed by Donald Sharp
parent e144d2ef14
commit fc1d4284b1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redhat/frr.init
View File

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