Fix 2 bugs into the RC script (restart and quietstart)

PR:		231984
Submitted by:	pautina@kharkiv.net
This commit is contained in:
Olivier Cochard 2018-10-06 07:31:18 +00:00
parent af7407136d
commit a4d50452a1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=481325
2 changed files with 23 additions and 22 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= frr
PORTVERSION= 3.0.3
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= frr-
CATEGORIES= net ipv6
PKGNAMESUFFIX= 3

View File

@ -89,6 +89,7 @@ do_cmd()
{
local ret
ret=0
frr_cmd=$1
for daemon in ${frr_daemons}; do
command=%%PREFIX%%/sbin/${daemon}
required_files=%%ETCDIR%%/${daemon}.conf
@ -118,11 +119,11 @@ frr_cmd=$1
case "$1" in
force*)
frr_cmd=${frr_cmd#force}
;;
frr_cmd=${frr_cmd#force}
;;
fast*)
frr_cmd=${frr_cmd#fast}
;;
frr_cmd=${frr_cmd#fast}
;;
esac
shift
@ -131,24 +132,24 @@ if [ $# -ge 1 ]; then
fi
case "${frr_cmd}" in
start)
if [ -n "${frr_extralibs_path}" ]; then
/sbin/ldconfig -m ${frr_extralibs_path}
fi
# Why should I need to add this check ?
checkyesno frr_enable && do_cmd "start"
;;
start|quietstart)
if [ -n "${frr_extralibs_path}" ]; then
/sbin/ldconfig -m ${frr_extralibs_path}
fi
# Why should I need to add this check ?
checkyesno frr_enable && do_cmd "start"
;;
stop)
frr_daemons=$(reverse_list ${frr_daemons})
do_cmd "stop"
;;
frr_daemons=$(reverse_list ${frr_daemons})
do_cmd "stop"
;;
restart)
frr_daemons=$(reverse_list ${frr_daemons})
do_cmd "stop"
frr_daemons=$(reverse_list ${frr_daemons})
checkyesno frr_enable && do_cmd "start"
;;
frr_daemons=$(reverse_list ${frr_daemons})
do_cmd "stop"
frr_daemons=$(reverse_list ${frr_daemons})
checkyesno frr_enable && do_cmd "start"
;;
*)
do_cmd "${frr_cmd}"
;;
do_cmd "${frr_cmd}"
;;
esac