diff options
| author | olivier <olivier@FreeBSD.org> | 2018-10-06 15:29:43 +0800 |
|---|---|---|
| committer | olivier <olivier@FreeBSD.org> | 2018-10-06 15:29:43 +0800 |
| commit | 20ab227dc139a38821dc7bfeac659bf8a5dde015 (patch) | |
| tree | 2e573ab56f5398384df454d4fd09169601464adb /net | |
| parent | 23f22efd1a2e81bea1e2030236fb3fd774f4fd6b (diff) | |
| download | freebsd-ports-gnome-20ab227dc139a38821dc7bfeac659bf8a5dde015.tar.gz freebsd-ports-gnome-20ab227dc139a38821dc7bfeac659bf8a5dde015.tar.zst freebsd-ports-gnome-20ab227dc139a38821dc7bfeac659bf8a5dde015.zip | |
Fix 2 bugs into the RC script (restart and quietstart)
PR: 231984
Submitted by: pautina@kharkiv.net
Diffstat (limited to 'net')
| -rw-r--r-- | net/frr4/Makefile | 2 | ||||
| -rw-r--r-- | net/frr4/files/frr.in | 43 |
2 files changed, 23 insertions, 22 deletions
diff --git a/net/frr4/Makefile b/net/frr4/Makefile index 9d45e62a0632..3ca22448603b 100644 --- a/net/frr4/Makefile +++ b/net/frr4/Makefile @@ -3,7 +3,7 @@ PORTNAME= frr PORTVERSION= 4.0 DISTVERSIONPREFIX= frr- -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net ipv6 PKGNAMESUFFIX= 4 diff --git a/net/frr4/files/frr.in b/net/frr4/files/frr.in index 20dbdd3248e8..462d0a940a68 100644 --- a/net/frr4/files/frr.in +++ b/net/frr4/files/frr.in @@ -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 |