diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-30 16:21:07 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-30 16:21:07 -0200 |
commit | d8ff3484131f428fcc0727cd504acb5050a36490 (patch) | |
tree | 8adfbb5b779f497e621d29277fcbe1536012eeb0 /etc | |
parent | 0319542cc712df59c57f014b4f925f516bcb5b4b (diff) | |
parent | ecf8336fcdf81e2aeb30a7ab82841dd7299ceb98 (diff) | |
download | FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.zip FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
-rw-r--r-- | etc/defaults/periodic.conf | 4 | ||||
-rw-r--r-- | etc/mtree/BSD.tests.dist | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 14f1a08..d97bd93 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -319,8 +319,8 @@ if [ -z "${source_periodic_confs_defined}" ]; then "use \$$var instead." >&2 case "$value" in [Yy][Ee][Ss]) - $var=YES - $periodvar=daily + eval $var=YES + eval $periodvar=daily ;; *) eval $var=\"$value\" diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 41e8421..f189ea9 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -109,10 +109,14 @@ .. .. .. + nss + .. regex data .. .. + resolv + .. rpc .. ssp |