diff options
author | Jamie Gritton <jamie@FreeBSD.org> | 2016-01-25 22:14:31 +0000 |
---|---|---|
committer | Jamie Gritton <jamie@FreeBSD.org> | 2016-01-25 22:14:31 +0000 |
commit | 0e00d580ff898ea5925b6a6784b4ce6778dff10d (patch) | |
tree | c799b3ac22a1d013fbb3678e082920464b31c8cc | |
parent | ca7ba6a8fdf9a7163c87f426c7f25129321ef56e (diff) | |
download | src-0e00d580ff898ea5925b6a6784b4ce6778dff10d.tar.gz src-0e00d580ff898ea5925b6a6784b4ce6778dff10d.zip |
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
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=294749
-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 a1b4bbcb35e4..fa0bc46be6ee 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 - \ |