mirror of
https://github.com/opnsense/src.git
synced 2026-02-10 06:15:40 -05:00
c96d5c97bb
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 (cherry picked from commit a2440348eed75bb7682579af0905b652747fd016) |
||
|---|---|---|
| .. | ||
| rc.d | ||
| tests | ||
| Makefile | ||
| netstart | ||
| network.subr | ||
| pccard_ether | ||
| rc | ||
| rc.bsdextended | ||
| rc.conf | ||
| rc.firewall | ||
| rc.initdiskless | ||
| rc.resume | ||
| rc.shutdown | ||
| rc.subr | ||
| rc.suspend | ||