diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
| commit | af0758169e63a4e7f6024c241d9254a8bc09908d (patch) | |
| tree | a31903fc62c875e8d23a391beb8ae57ed0092c45 /etc | |
| parent | 79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36 (diff) | |
| parent | 6114d518f71115abacc5d610c4d668ef6e0b2f37 (diff) | |
| download | FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.zip FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/periodic/security/security.functions | 2 | ||||
| -rwxr-xr-x | etc/rc.d/jail | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/periodic/security/security.functions b/etc/periodic/security/security.functions index bc2bcba..c2c757a 100644 --- a/etc/periodic/security/security.functions +++ b/etc/periodic/security/security.functions @@ -51,7 +51,7 @@ check_diff() { rc=0 if [ "$1" = "new_only" ]; then shift - filter="grep '^[>+]'" + filter="grep '^[>+][^+]'" else filter="cat" fi 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 - \ |
