Page MenuHomeFreeBSD

etcupdate: Make diff -l actually work
ClosedPublic

Authored by des on May 29 2026, 3:34 PM.
Tags
None
Referenced Files
F163266002: D57330.diff
Tue, Jul 21, 2:18 PM
Unknown Object (File)
Sat, Jul 18, 4:06 PM
Unknown Object (File)
Wed, Jul 15, 2:00 PM
Unknown Object (File)
Wed, Jul 15, 5:47 AM
Unknown Object (File)
Wed, Jul 15, 5:47 AM
Unknown Object (File)
Mon, Jul 13, 10:38 PM
Unknown Object (File)
Fri, Jul 3, 1:39 PM
Unknown Object (File)
Sat, Jun 27, 6:17 PM

Details

Summary

While here, remove unnecessary blank lines.

MFC after: 1 week
Fixes: 6d65c91b9a47 ("etcupdate: fix arguments order of diff command")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 73547
Build 70430: arc lint + arc unit

Event Timeline

des requested review of this revision.May 29 2026, 3:34 PM

diff -l works for me as-is as intended:

>etcupdate diff -l

Changed: /etc/pam.d/ftpd

>etcupdate diff
Index: /etc/pam.d/ftpd
===================================================================
--- /etc/pam.d/ftpd (stock)
+++ /etc/pam.d/ftpd (local)
@@ -15,3 +15,4 @@

 # session
 session                required        pam_permit.so
+#XXX
\ No newline at end of file

Can you please provide an example where it fails to produce output needed?

# etcupdate diff -l | grep \^Changed
Changed: /etc/master.passwd
# etcupdate diff | grep \^Index     
Index: /etc/master.passwd
Index: /etc/pam.d/ftpd
Index: /etc/sysctl.conf
Index: /etc/group
Index: /etc/shells
This revision is now accepted and ready to land.Jun 3 2026, 10:59 AM
This revision was automatically updated to reflect the committed changes.