From owner-svn-ports-head@freebsd.org Mon Oct 5 07:48:18 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7782D3FB450; Mon, 5 Oct 2020 07:48:18 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4C4XlQ2PwBz4nvJ; Mon, 5 Oct 2020 07:48:18 +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 3699D125C5; Mon, 5 Oct 2020 07:48:18 +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 0957mHUm005492; Mon, 5 Oct 2020 07:48:17 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0957mHxB005491; Mon, 5 Oct 2020 07:48:17 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <202010050748.0957mHxB005491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Mon, 5 Oct 2020 07:48:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551478 - in head/net/frr7: . files X-SVN-Group: ports-head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: in head/net/frr7: . files X-SVN-Commit-Revision: 551478 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 07:48:18 -0000 Author: olivier Date: Mon Oct 5 07:48:17 2020 New Revision: 551478 URL: https://svnweb.freebsd.org/changeset/ports/551478 Log: Harden RC script by adding double quotes. While here, document usage of frr_vtysh_boot. PR: 250099 Submitted by: eugen Modified: head/net/frr7/Makefile head/net/frr7/files/frr.in Modified: head/net/frr7/Makefile ============================================================================== --- head/net/frr7/Makefile Mon Oct 5 06:57:09 2020 (r551477) +++ head/net/frr7/Makefile Mon Oct 5 07:48:17 2020 (r551478) @@ -3,7 +3,7 @@ PORTNAME= frr PORTVERSION= 7.4 DISTVERSIONPREFIX= frr- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 7-pythontools Modified: head/net/frr7/files/frr.in ============================================================================== --- head/net/frr7/files/frr.in Mon Oct 5 06:57:09 2020 (r551477) +++ head/net/frr7/files/frr.in Mon Oct 5 07:48:17 2020 (r551478) @@ -11,9 +11,13 @@ # frr_enable="YES" # # You may also wish to use the following variables to fine-tune startup: -# frr_flags="" -# frr_daemons="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd" +# Enable Integrated configuration mode (using the single configuration file +# frr.conf in place of one file for each dameon) # frr_vtysh_boot="YES" +# Selecting limited set of daemons to run +# frr_daemons="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd" +# Global tuning +# frr_flags="" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on @@ -109,7 +113,7 @@ do_cmd() continue fi fi - if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then + if [ ${frr_cmd} = "stop" ] && [ -z "$(check_process ${command})" ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\}