diff options
| author | Michael Osipov <michaelo@FreeBSD.org> | 2023-11-24 09:26:41 +0000 |
|---|---|---|
| committer | Michael Osipov <michaelo@FreeBSD.org> | 2024-01-30 11:43:33 +0000 |
| commit | 6d9195b5f763803f2bce37e0283563db76950aae (patch) | |
| tree | 5df86c411a7dd8ee8f630848ec40c91709c470d5 | |
| parent | a465a52e80922510cb4ab493f29b51055ca78bf8 (diff) | |
| download | src-6d9195b5f763803f2bce37e0283563db76950aae.tar.gz src-6d9195b5f763803f2bce37e0283563db76950aae.zip | |
periodic: Make security diff(1) output as small is possible
Make, by default, security diff(1) produce a unified output with a context of
zero (0) lines. This reduces output of unrelated lines in e-mails delivered
to root.
PR: 270266
Approved by: jrm (mentor), karels
MFC after: 1 month
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D43071
(cherry picked from commit 3aa71ea7c231a4e60a7e1b9b677e379e17432fc8)
| -rw-r--r-- | share/man/man5/periodic.conf.5 | 5 | ||||
| -rw-r--r-- | usr.sbin/periodic/periodic.conf | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 681f3696b87f..6043263f3e3a 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 7, 2020 +.Dd December 31, 2023 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -813,7 +813,8 @@ Set to the arguments to pass to the .Xr diff 1 utility when generating differences. The default is -.Fl b u . +.Fl b +.Fl U Cm 0 . .It Va security_status_chksetuid_enable .Pq Vt bool Set to diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index d37928d09925..2da2ac1ae384 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -251,7 +251,7 @@ security_show_badconfig="NO" # scripts returning 2 # These options are used by the security periodic(8) scripts spawned in # daily and weekly 450.status-security. security_status_logdir="/var/log" # Directory for logs -security_status_diff_flags="-b -u" # flags for diff output +security_status_diff_flags="-b -U 0" # flags for diff output # Each of the security_status_*_period options below can have one of the # following values: |