Date: Sat, 6 Oct 2018 07:29:43 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481324 - in head/net/frr4: . files Message-ID: <201810060729.w967Thft033778@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Sat Oct 6 07:29:43 2018 New Revision: 481324 URL: https://svnweb.freebsd.org/changeset/ports/481324 Log: Fix 2 bugs into the RC script (restart and quietstart) PR: 231984 Submitted by: pautina@kharkiv.net Modified: head/net/frr4/Makefile head/net/frr4/files/frr.in Modified: head/net/frr4/Makefile ============================================================================== --- head/net/frr4/Makefile Sat Oct 6 07:27:32 2018 (r481323) +++ head/net/frr4/Makefile Sat Oct 6 07:29:43 2018 (r481324) @@ -3,7 +3,7 @@ PORTNAME= frr PORTVERSION= 4.0 DISTVERSIONPREFIX= frr- -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net ipv6 PKGNAMESUFFIX= 4 Modified: head/net/frr4/files/frr.in ============================================================================== --- head/net/frr4/files/frr.in Sat Oct 6 07:27:32 2018 (r481323) +++ head/net/frr4/files/frr.in Sat Oct 6 07:29:43 2018 (r481324) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810060729.w967Thft033778>