Paths

Table of Contentst

Differential D54935

etcupdate: Do not ignore empty files.
ClosedPublic
Actions

Authored by delphij on Jan 29 2026, 3:32 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Wed, Feb 18, 2:04 PM

	Unknown Object (File)
	Sun, Feb 15, 10:10 AM

	Unknown Object (File)
	Sat, Feb 14, 2:23 PM

	Unknown Object (File)
	Sat, Feb 14, 2:09 PM

	Unknown Object (File)
	Sat, Feb 14, 2:31 AM

	Unknown Object (File)
	Wed, Feb 11, 12:07 AM

	Unknown Object (File)
	Mon, Feb 9, 3:13 AM

	Unknown Object (File)
	Sun, Feb 8, 1:58 PM

View All 17 Files

Subscribers

Details

Reviewers

jhb
markj
emaste
jrtc27

Commits

rG4f7336a93cb8: etcupdate: Do not ignore empty files.

Summary

PR: bin/292773
MFC after: 1 week

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

delphij created this revision.Jan 29 2026, 3:32 AM

Herald added a subscriber: imp. · View Herald TranscriptJan 29 2026, 3:32 AM

delphij requested review of this revision.Jan 29 2026, 3:32 AM

Harbormaster completed remote builds in B70202: Diff 170671.Jan 29 2026, 3:32 AM

I'm not very familiar with etcupdate internals but this seems reasonable to me. OTOH I don't know what clutter the comment is referring to.

It'd be nice to add a regression test for this.

usr.sbin/etcupdate/etcupdate.sh
250	Presumably this comment needs to be updated too?

Add regression test for installing empty files.

Verified with the change reverted and applied.

Harbormaster completed remote builds in B70265: Diff 170824.Sat, Jan 31, 4:13 AM

delphij marked an inline comment as done.Sat, Jan 31, 4:15 AM

delphij added inline comments.

usr.sbin/etcupdate/etcupdate.sh
250	I think the comment is still true (we still ignore generated files, and comment didn't explicitly say empty files)...

markj added a reviewer: jrtc27.Sat, Jan 31, 11:16 PM

Seems ok to me. You might give a few days for other reviewers to chime in.

This revision is now accepted and ready to land.Mon, Feb 2, 2:11 PM

Closed by commit rG4f7336a93cb8: etcupdate: Do not ignore empty files. (authored by delphij). · Explain WhyThu, Feb 5, 3:45 AM

This revision was automatically updated to reflect the committed changes.

delphij marked an inline comment as done.

delphij added a commit: rG4f7336a93cb8: etcupdate: Do not ignore empty files..

It used to be that make distribution generated a lot of empty files and they would indeed clutter the output of etcupdate diff. Did you look at the output of etcupdate diff before and after this change? And/or did you see if there are empty files in /var/db/etcupdate/current?

Revision Contents
Changeset List

Path

Size

usr.sbin/

etcupdate/

4 lines

tests/

1 line

empty_file_test.sh

86 lines

Diff 171190

usr.sbin/etcupdate/etcupdate.sh

Loading...

usr.sbin/etcupdate/tests/Makefile

Loading...

usr.sbin/etcupdate/tests/empty_file_test.sh

Loading...