Attachment 202349 Details for Bug 235969 – updated patch

[patch] updated patch

frr.in.patch-upd (text/plain), 1.76 KB, created by Yakov Sh. on 2019-02-25 11:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yakov Sh.

Created: 2019-02-25 11:30:11 UTC

Size: 1.76 KB

patch

obsolete

>--- frr.in.orig	2019-02-21 19:49:40.120878000 +0300
>+++ frr.in 14:22:08.394181000 +0300
>@@ -13,7 +13,7 @@
> # You may also wish to use the following variables to fine-tune startup:
> #  frr_flags=""
> #  frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"
>-#  frr_vysh_boot="YES"
>+#  frr_vtysh_boot="YES"
> # Per daemon tuning may be done with daemon_name_flags
> #  zebra_flags="-P 0"
> #  bgpd_flags="-nrP 0" and so on
>@@ -90,16 +90,25 @@
> 	local ret
> 	ret=0
> 	frr_cmd=$1
>+	if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then
>+	    echo "Checking intergrated config..."
>+	    daemon="vtysh"
>+	    daemon_flags=""
>+	    command=/usr/local/bin/${daemon}
>+	    check_config
>+	fi
> 	for daemon in ${frr_daemons}; do
> 	    command=/usr/local/sbin/${daemon}
>-	    required_files=/usr/local/etc/frr/${daemon}.conf
> 	    pidfile=/var/run/frr/${daemon}.pid
>-	    if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
>-		check_config
>+	    if ! checkyesno frr_vtysh_boot; then
>+	    	required_files=/usr/local/etc/frr/${daemon}.conf
>+		if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
>+		    check_config
>+		fi
>+		if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
>+		    continue
>+		fi
> 	    fi
>-	    if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
>-			continue
>-	    fi
> 	    if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then
> 			continue
> 	    fi
>@@ -108,7 +117,7 @@
> 	    _rc_restart_done=false
> 	    run_rc_command "$1" || ret=1
> 	done
>-	if checkyesno frr_vtysh_boot; then
>+	if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then
> 	    echo "Booting for integrated-vtysh-config..."
> 	    /usr/local/bin/vtysh -b
> 	fi

Actions: View | Diff

Attachments on bug 235969: 202299 | 202349