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

Merge pull request #6787 from toreanderson/master

Browse Source 
tools: do not silently ignore errors when loading config during startup
This commit is contained in:
David Lamparter 2020-07-28 15:09:15 +02:00 committed by GitHub
commit f41f38d88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/frr.in
View File

@ -77,7 +77,7 @@ vtysh_b ()
{ {
# Rember, that all variables have been incremented by 1 in convert_daemon_prios() # Rember, that all variables have been incremented by 1 in convert_daemon_prios()
if [ "$vtysh_enable" = 2 -a -f $C_PATH/frr.conf ]; then if [ "$vtysh_enable" = 2 -a -f $C_PATH/frr.conf ]; then
$VTYSH -b -n $VTYSH -b
fi fi
} }

4
tools/frrcommon.sh.in
View File

@ -65,9 +65,9 @@ vtysh_b () {
[ "$1" = "watchfrr" ] && return 0 [ "$1" = "watchfrr" ] && return 0
[ -r "$C_PATH/frr.conf" ] || return 0 [ -r "$C_PATH/frr.conf" ] || return 0
if [ -n "$1" ]; then if [ -n "$1" ]; then
"$VTYSH" `echo $nsopt` -b -n -d "$1" "$VTYSH" `echo $nsopt` -b -d "$1"
else else
"$VTYSH" `echo $nsopt` -b -n "$VTYSH" `echo $nsopt` -b
fi fi
} }