Bug#772856: Please backport .conf.d configuration directory support from 218

[Josh Triplett]

On Thu, Dec 11, 2014 at 10:57:05PM +0100, Michael Biebl wrote:
> Hi,
> 
> Am 11.12.2014 um 19:57 schrieb Josh Triplett:
> > Package: systemd
> > Version: 215-8
> > Severity: wishlist
> > 
> > Please consider backporting the patches in systemd 218 that implement
> > ..conf.d configuration directories for each existing .conf file.  In
> > particular, I'd really like to have logind.conf.d and journald.conf.d
> > support for jessie.
> 
> Do you have the commit IDs by chance?

7f0a55d4325f7df91f91b3b818f61f97d78df14a Introduce CONF_DIRS_NULSTR helper to define standard conf dirs
e8461023531de98ac6a49eff9d6ffeff6315249c logind: Support logind.conf.d directories in the usual search paths
02b75c9edd61f47de7940b61b97b071b69f38a11 man/logind.conf.xml: Make "man logind.conf.d" work too
d3fae78fe86f1dfcdb07fd613ccbb3adf547a617 man: Factor out a common snippet for .d directories and precedence
1b907b5c3b11491b790e541dd24255a758511a2f core: Support system.conf.d and user.conf.d directories in the usual search paths
a9edaeff8481573764288ccf7e433a95b6dc7c03 journald: Support journald.conf.d directories in the usual search paths
778b6a3f8888ec9496143c92c8cbf95f5c891df9 systemd-sleep: Support sleep.conf.d directories in the usual search paths
396f9e2b327d702ea9502b80febf836283e19350 bootchart: Support bootchart.conf.d directories in the usual search paths
301af7e4853ad0281402f8d86f5a77c6cb7ce9f4 coredump: Support coredump.conf.d directories in the usual search paths
f2dacc96b25528ca1b0caca6364a69d656cf1569 resolved: Support resolved.conf.d directories in the usual search paths
be795898c0d2fa21e3389b89793dcd45c47f8b9f timesyncd: Support timesyncd.conf.d directories in the usual search paths

(There's one more for journald-remote and journal-upload, but the latter
doesn't exist in 215, and the former doesn't have a config file in 215,
so the patch wouldn't make sense.)

If that turns out to be too large for a backport, I'd be happy with just
logind.conf.d and journald.conf.d:

7f0a55d4325f7df91f91b3b818f61f97d78df14a Introduce CONF_DIRS_NULSTR helper to define standard conf dirs
e8461023531de98ac6a49eff9d6ffeff6315249c logind: Support logind.conf.d directories in the usual search paths
02b75c9edd61f47de7940b61b97b071b69f38a11 man/logind.conf.xml: Make "man logind.conf.d" work too
d3fae78fe86f1dfcdb07fd613ccbb3adf547a617 man: Factor out a common snippet for .d directories and precedence
a9edaeff8481573764288ccf7e433a95b6dc7c03 journald: Support journald.conf.d directories in the usual search paths

> Can they be cherry-picked easily on top of v215?

Yes, with fairly simple merges, if you cherry pick the following first:
938a560 sysusers: allow overrides in /etc and /run
987d561 resolved: let config_parse() open the configuration file for us
d2fda97 Constify ConfigTableItem tables
36f822c Let config_parse open file where applicable

(Note in all of the above patches that journal-upload doesn't exist in
v215 so you can ignore anything related to it, and journal-remote
doesn't have configuration so you can ignore that too; just discard
those bits of the patch entirely.  Any other merge conflicts are just
trivial formatting differences.)

> Personally, I wouldn't mind adding support for that, that said, you
> really need to convince the release team first.

Happy to do so.  Do you want me to file a request with the release team and
point directly to the upstream diffs, asking if backports of those seem
acceptable?

- Josh Triplett