svn commit: r294964 - stable/10/etc/rc.d

[Jamie Gritton]

Author: jamie
Date: Thu Jan 28 00:41:07 2016
New Revision: 294964
URL: https://svnweb.freebsd.org/changeset/base/294964

Log:
  MFC r294749:
  
    Allow the (old rc-style) exec_afterstart jail parameters to start numbering
    at 0, like exec_prestart and the others do.  Make param0 optional, i.e.
    still look for param1.
  
  PR:		142973

Modified:
  stable/10/etc/rc.d/jail
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/jail
==============================================================================
--- stable/10/etc/rc.d/jail	Wed Jan 27 22:56:04 2016	(r294963)
+++ stable/10/etc/rc.d/jail	Thu Jan 28 00:41:07 2016	(r294964)
@@ -32,7 +32,7 @@ need_dad_wait=
 #	Extract value from ${jail_$jv_$name} or ${jail_$name} and
 #	set it to $param.  If not defined, $defval is used.
 #	When $num is [0-9]*, ${jail_$jv_$name$num} are looked up and
-#	$param is set by using +=.
+#	$param is set by using +=.  $num=0 is optional (params may start at 1).
 #	When $num is YN or NY, the value is interpret as boolean.
 extract_var()
 {
@@ -72,7 +72,7 @@ extract_var()
 			eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\"
 			if [ -n "$_tmpargs" ]; then 
 				echo "	$_param += \"$_tmpargs\";"
-			else
+			elif [ $i != 0 ]; then
 				break;
 			fi
 			i=$(($i + 1))
@@ -202,7 +202,7 @@ parse_options()
 		extract_var $_jv exec_poststop exec.poststop 0 ""
 
 		echo "	exec.start += \"$_exec_start\";"
-		extract_var $_jv exec_afterstart exec.start 1 ""
+		extract_var $_jv exec_afterstart exec.start 0 ""
 		echo "	exec.stop = \"$_exec_stop\";"
 
 		extract_var $_jv consolelog exec.consolelog - \