View | Details | Raw Unified | Return to bug 235969 | Differences between
and this patch

Collapse All | Expand All

(-)frr.in 14:22:08.394181000 +0300 (-8 / +17 lines)
Lines 13-19 Link Here
13
# You may also wish to use the following variables to fine-tune startup:
13
# You may also wish to use the following variables to fine-tune startup:
14
#  frr_flags=""
14
#  frr_flags=""
15
#  frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"
15
#  frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"
16
#  frr_vysh_boot="YES"
16
#  frr_vtysh_boot="YES"
17
# Per daemon tuning may be done with daemon_name_flags
17
# Per daemon tuning may be done with daemon_name_flags
18
#  zebra_flags="-P 0"
18
#  zebra_flags="-P 0"
19
#  bgpd_flags="-nrP 0" and so on
19
#  bgpd_flags="-nrP 0" and so on
Lines 90-105 Link Here
90
	local ret
90
	local ret
91
	ret=0
91
	ret=0
92
	frr_cmd=$1
92
	frr_cmd=$1
93
	if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then
94
	    echo "Checking intergrated config..."
95
	    daemon="vtysh"
96
	    daemon_flags=""
97
	    command=/usr/local/bin/${daemon}
98
	    check_config
99
	fi
93
	for daemon in ${frr_daemons}; do
100
	for daemon in ${frr_daemons}; do
94
	    command=/usr/local/sbin/${daemon}
101
	    command=/usr/local/sbin/${daemon}
95
	    required_files=/usr/local/etc/frr/${daemon}.conf
96
	    pidfile=/var/run/frr/${daemon}.pid
102
	    pidfile=/var/run/frr/${daemon}.pid
97
	    if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
103
	    if ! checkyesno frr_vtysh_boot; then
98
		check_config
104
	    	required_files=/usr/local/etc/frr/${daemon}.conf
105
		if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
106
		    check_config
107
		fi
108
		if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
109
		    continue
110
		fi
99
	    fi
111
	    fi
100
	    if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
101
			continue
102
	    fi
103
	    if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then
112
	    if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then
104
			continue
113
			continue
105
	    fi
114
	    fi
Lines 108-114 Link Here
108
	    _rc_restart_done=false
117
	    _rc_restart_done=false
109
	    run_rc_command "$1" || ret=1
118
	    run_rc_command "$1" || ret=1
110
	done
119
	done
111
	if checkyesno frr_vtysh_boot; then
120
	if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then
112
	    echo "Booting for integrated-vtysh-config..."
121
	    echo "Booting for integrated-vtysh-config..."
113
	    /usr/local/bin/vtysh -b
122
	    /usr/local/bin/vtysh -b
114
	fi
123
	fi

Return to bug 235969