svn commit: r551478 - in head/net/frr7: . files

[Olivier Cochard]

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}\"\}