diff options
| author | Jamie Gritton <jamie@FreeBSD.org> | 2023-09-25 00:03:09 +0000 |
|---|---|---|
| committer | Jamie Gritton <jamie@FreeBSD.org> | 2023-09-25 00:03:09 +0000 |
| commit | a2440348eed75bb7682579af0905b652747fd016 (patch) | |
| tree | 9f8f6dc4bae70c34c72dac55a0320487544ac649 /libexec | |
| parent | 5e29272bf57e24a16f3a17f037f9a5e7cf25ed90 (diff) | |
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/rc/rc.d/jail | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libexec/rc/rc.d/jail b/libexec/rc/rc.d/jail index f8995c7e3b00..f12dae280bb0 100755 --- a/libexec/rc/rc.d/jail +++ b/libexec/rc/rc.d/jail @@ -126,7 +126,9 @@ parse_options() if [ -r "$_jconf" ]; then _conf="$_jconf" return 0 - elif [ -r "$_jconfdir" ]; then + elif [ -r "$_jconfdir" ] && ! egrep -q \ + '^\s*\.include\s*["'\'']?/etc/jail.conf.d/' "$jail_conf" \ + 2>/dev/null; then _conf="$_jconfdir" return 0 elif [ -r "$jail_conf" ]; then |