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

[Josh Triplett]

On Fri, Dec 12, 2014 at 09:34:37AM +0100, Michael Biebl wrote:
> Am 12.12.2014 um 00:29 schrieb Josh Triplett:
> 
> > 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
> 
> Hm, that's more code churn then I'd have expected, even for the trimmed
> down case.

If you mean the set of supporting patches, the backport can be made
smaller by omitting most of those patches; it'd just require a less
trivial cherry-pick.

> >> 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?
> 
> Yes, feel free to do so.

OK, I can do that.

- Josh Triplett