OptionalObsoleteFiles.inc: add some now-optional rc.d scripts
ClosedPublic
Actions

Authored by ivy on May 28 2025, 12:36 AM.

Details

Reviewers

des
kevans
brooks
imp
kp
jhb

Group Reviewers

Commits

rG0ddc223c6d52: OptionalObsoleteFiles.inc: add some now-optional rc.d scripts

Summary

After f91d251b399a, some rc.d scripts are gated behind the src.conf knob
for the services they start. Add them to OptionalObsoleteFiles.inc so
they are properly removed when the knob is disabled.

Fixes: f91d251b399a ("rc.d: move some rc scripts to their packages")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ivy requested review of this revision.May 28 2025, 12:36 AM

ivy created this revision.

Harbormaster completed remote builds in B64483: Diff 156130.May 28 2025, 12:37 AM

i've checked all of these and there do not appear to be any more instances of the problem in D50557, i.e. everything that depends on one of these scripts also depends on something else as well. it wouldn't hurt for someone else to check that again in case i missed something.

ivy added reviewers: kp, jhb.May 28 2025, 12:40 AM

Generally seem fine to me, just a note about ctld.

tools/build/mk/OptionalObsoleteFiles.inc
2676	Humm, is the rc.d script conditional on MK_ISCSI? Given the last review about moving ctld into a `ctl` package I'm kind of surprised the rc.d script is conditional on this knob.

jhb added inline comments.May 30 2025, 7:13 PM

tools/build/mk/OptionalObsoleteFiles.inc
2676	Ah, so it is, but I think the correct fix is to make ctld always installed in rc.d/Makefile, that is MK_ISCSI should only restrict the iscsi package, not the `ctl` package.