diff options
author | jamie <jamie@FreeBSD.org> | 2016-01-28 00:41:07 +0000 |
---|---|---|
committer | jamie <jamie@FreeBSD.org> | 2016-01-28 00:41:07 +0000 |
commit | 4f5539ac65cf9b57223f4843a05ffa1af9dad874 (patch) | |
tree | 576c5c1c7c72b6ef915d07a6593cb01a601a6f3b /etc | |
parent | 42ee9ca9933fb815ce7d9098f10bad6fe38c69b4 (diff) | |
download | FreeBSD-src-4f5539ac65cf9b57223f4843a05ffa1af9dad874.zip FreeBSD-src-4f5539ac65cf9b57223f4843a05ffa1af9dad874.tar.gz |
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
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.d/jail | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 7dd25ea..dfa301b 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -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 - \ |