Date: Thu, 14 Mar 2019 20:17:32 +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: r495731 - in head/net/frr6: . files Message-ID: <201903142017.x2EKHWtm090939@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Thu Mar 14 20:17:31 2019 New Revision: 495731 URL: https://svnweb.freebsd.org/changeset/ports/495731 Log: Fix RC script when VTYSH (integrated configuration) mode is enabled PR: 235969 Submitted by: Yakov Sh. <yman@protonmail.ch> Modified: head/net/frr6/Makefile head/net/frr6/files/frr.in Modified: head/net/frr6/Makefile ============================================================================== --- head/net/frr6/Makefile Thu Mar 14 20:02:04 2019 (r495730) +++ head/net/frr6/Makefile Thu Mar 14 20:17:31 2019 (r495731) @@ -3,6 +3,7 @@ PORTNAME= frr PORTVERSION= 6.0.2 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMESUFFIX= 6 @@ -15,10 +16,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 - USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline + +CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes Modified: head/net/frr6/files/frr.in ============================================================================== --- head/net/frr6/files/frr.in Thu Mar 14 20:02:04 2019 (r495730) +++ head/net/frr6/files/frr.in Thu Mar 14 20:17:31 2019 (r495731) @@ -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 @@ do_cmd() 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=%%PREFIX%%/bin/${daemon} + check_config + fi for daemon in ${frr_daemons}; do command=%%PREFIX%%/sbin/${daemon} - required_files=%%ETCDIR%%/${daemon}.conf pidfile=/var/run/frr/${daemon}.pid - if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then - check_config - fi - if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then - continue - fi + if ! checkyesno frr_vtysh_boot; then + required_files=%%ETCDIR%%/${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} = "stop" ] && [ -z $(check_process ${command}) ]; then continue fi @@ -108,7 +117,7 @@ do_cmd() _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..." %%PREFIX%%/bin/vtysh -b fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903142017.x2EKHWtm090939>