Page MenuHomeFreeBSD

create sendmail directories only from BSD.sendmail.dist
ClosedPublic

Authored by emaste on Sun, Mar 22, 1:17 PM.

Details

Summary

Else when WITHOUT_SENDMAIL is set with pkgbase we create a sendmail package containing nothing but two directories.

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

emaste created this revision.Sun, Mar 22, 1:17 PM
manu accepted this revision.Sun, Mar 22, 1:22 PM
This revision is now accepted and ready to land.Sun, Mar 22, 1:22 PM

We might need to look at a more holistic approach to this, e.g. adding an mtree option to include or exclude entries based on tags, or perhaps preprocessing the mtree files before stageworld. However, we already had BSD.sendmail.dist split out (although rS348981 re-added clientmqueue to BSD.var.dist, duplicating the entry in BSD.sendmail.dist) so it seemed sensible to use it for now.

BSD.var.dist still has at, dma, and unbound entries.

emaste added inline comments.Sun, Mar 22, 1:55 PM
etc/mtree/BSD.sendmail.dist
15 ↗(On Diff #69763)

accidentally deleted a space on this line, will revert that before commit.

gshapiro accepted this revision.Sun, Mar 22, 2:41 PM

It is fine to commit as is. One thing to consider would be simplifying:

/set gname=daemon
            mqueue          tags=package=sendmail

to

mqueue          gname=daemon tags=package=sendmail

(note that the mqueue line above should be indented but the comment block doesn't allow leading spaces)

This revision was automatically updated to reflect the committed changes.

It is fine to commit as is. One thing to consider would be simplifying:

Thanks, sorry I didn't see your comment before committing. I agree this is preferable and committed in rS359216 - although I don't think it matters too much for this specific instance there are are couple more cases in BSD.var.dist that we'll have to address and it's good to have this as a clean example.