Created attachment 182740 [details] Install distribution files with make distribution make installworld installs the new configuration files that go in /etc/syslog.d, /etc/newsyslog.conf.d, and /etc/cron.d. They get installed unconditionally, breaking any customizations. They should be installed as part of make distribution, to be installed on a running system by mergemaster or etcupdate.
A commit references this bug: Author: ngie Date: Fri May 19 17:04:01 UTC 2017 New revision: 318545 URL: https://svnweb.freebsd.org/changeset/base/318545 Log: Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make install` I incorrectly started this pattern in r277541 with the opensm newsyslog.conf.d file, and continued using it in r318441 and r318443. This will fix the files being handled improperly via installworld, preventing tools like etcupdate, mergemaster, etc from functioning properly when comparing the installed contents on a system vs the contents in a source tree when doing merges. PR: 219404 Submitted by: Dan McGregor <dan.mcgregor@usask.ca> MFC after: 2 weeks MFC with: r277541, r318441, r318443 Sponsored by: Dell EMC Isilon Changes: head/etc/Makefile
Can this be MFCd before 11.1?
A commit references this bug: Author: ngie Date: Thu Jun 22 07:42:36 UTC 2017 New revision: 320228 URL: https://svnweb.freebsd.org/changeset/base/320228 Log: MFC r318545: Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make install` I incorrectly started this pattern in r277541 with the opensm newsyslog.conf.d file, and continued using it in r318441 and r318443. This will fix the files being handled improperly via installworld, preventing tools like etcupdate, mergemaster, etc from functioning properly when comparing the installed contents on a system vs the contents in a source tree when doing merges. PR: 219404 MFC with: r277541, r318441, r318443 Changes: _U stable/10/ stable/10/etc/Makefile
The issue is fixed enough on ^/head. I've been bikeshedded enough with the change that I don't want to push it through to ^/stable/11 or ^/stable/10 (since a handful of contentious changes are generating more noise than I would like).
(In reply to Ngie Cooper from comment #4) Fair enough, it's just that stable/11 is still installing newsyslog.d stuff with installworld. Not a big deal, I'll just carry on with a small patch locally.
A commit references this bug: Author: ngie Date: Wed Jul 19 21:06:05 UTC 2017 New revision: 321251 URL: https://svnweb.freebsd.org/changeset/base/321251 Log: MFC note: only the newsyslog.conf.d change has been backported to unbreak "make distribution" with etc/newsyslog.conf.d/opensm.conf installation. The cron.d and syslog.d changes were omitted by request to avoid churn on ^/stable/{10,11}. Requested by: jhb, peter MFC r318545: Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make install` I incorrectly started this pattern in r277541 with the opensm newsyslog.conf.d file, and continued using it in r318441 and r318443. This will fix the files being handled improperly via installworld, preventing tools like etcupdate, mergemaster, etc from functioning properly when comparing the installed contents on a system vs the contents in a source tree when doing merges. PR: 219404 MFC with: r277541, r318441, r318443 Changes: _U stable/10/ stable/10/etc/Makefile
A commit references this bug: Author: ngie Date: Wed Jul 19 21:06:31 UTC 2017 New revision: 321252 URL: https://svnweb.freebsd.org/changeset/base/321252 Log: MFC note: only the newsyslog.conf.d change has been backported to unbreak "make distribution" with etc/newsyslog.conf.d/opensm.conf installation. The cron.d and syslog.d changes were omitted by request to avoid churn on ^/stable/{10,11}. Requested by: jhb, peter MFC r318545: Install {cron.d,newsyslog.conf.d,syslog.d} via `make distribution`, not `make install` I incorrectly started this pattern in r277541 with the opensm newsyslog.conf.d file, and continued using it in r318441 and r318443. This will fix the files being handled improperly via installworld, preventing tools like etcupdate, mergemaster, etc from functioning properly when comparing the installed contents on a system vs the contents in a source tree when doing merges. PR: 219404 MFC with: r277541, r318441, r318443 Changes: _U stable/11/ stable/11/etc/Makefile
I did the minimal effort job of fixing how newsyslog.conf.d is installed on the stable branches -- it's fixed now.