opnsense-src/libexec
Jamie Gritton a2440348ee jail: avoid a clash with /etc/jail.conf.d between rc and jail(8)
Since 13.1, /etc/rc.d/jail has looked for a per-jail config file in
/etc/jail.conf.d. For RELENG 14, the ".include" directive was added to
jail(8), with a sample line in the jail.conf(5) man page that includes
"/etc/jail.conf.d/*.conf".

These two use cases don't work together. When the jail.conf.d files
are included from a master jail.conf, the files in jail.conf.d are
likely to hold only partial configurations, and shouldn't be directly
loaded by rc.d/jail. But there are existing configurations that depend
on the current rc.d behavior. While users could be advised not to
include from /etc/jail.conf.d, it's the natural choice even if not
mentioned in jail.conf.5.

The workaround is for rc.d/jail to continue to load the individual
files, but only when /etc/jail.conf doesn't include from that
directory (via a simple grep test), This allows the current use
while not breaking the previous use.
Reported by:	antranigv at freebsd.am
Differential Revision:	https://reviews.freebsd.org/D41962
2023-09-24 17:03:09 -07:00
..
atf
atrun Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
blacklistd-helper
bootpd Fix partially removed comment by removing the rest 2023-08-16 14:17:33 -06:00
comsat Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
dma
fingerd Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
flua
ftpd ftpd: correct deprecation notice markup 2023-09-13 22:13:42 +01:00
getty Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
hyperv
mail.local
makewhatis.local Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
mknetid Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
phttpget Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
pppoed Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rbootd Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
rc jail: avoid a clash with /etc/jail.conf.d between rc and jail(8) 2023-09-24 17:03:09 -07:00
revnetgroup Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rpc.rquotad Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rpc.rstatd Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rpc.rusersd Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rpc.rwalld Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rpc.sprayd Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
rtld-elf rtld: output rtld errors into the dbg channel 2023-09-15 22:40:41 +03:00
rtld-elf32
save-entropy save-entropy: Add manual page 2023-09-18 13:33:59 +02:00
smrsh
talkd Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
tcpd
tests
tftp-proxy
tftpd Remove $FreeBSD$: one-line nroff pattern 2023-08-16 11:55:15 -06:00
ulog-helper
ypxfr Remove $FreeBSD$: two-line nroff pattern 2023-08-16 11:55:10 -06:00
Makefile
Makefile.inc