From owner-svn-ports-all@freebsd.org Thu Mar 14 20:17:33 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF635152C041; Thu, 14 Mar 2019 20:17:32 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 924C86AA66; Thu, 14 Mar 2019 20:17:32 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B78727746; Thu, 14 Mar 2019 20:17:32 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2EKHW9G090941; Thu, 14 Mar 2019 20:17:32 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2EKHWtm090939; Thu, 14 Mar 2019 20:17:32 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <201903142017.x2EKHWtm090939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Thu, 14 Mar 2019 20:17:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495731 - in head/net/frr6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: in head/net/frr6: . files X-SVN-Commit-Revision: 495731 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 924C86AA66 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2019 20:17:33 -0000 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. 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