diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:06:41 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:32 -0500 |
| commit | 396f9e2b327d702ea9502b80febf836283e19350 (patch) | |
| tree | f749cbfe9b5d1dc01c64ad7445051e7d06590071 /src/bootchart | |
| parent | 778b6a3f8888ec9496143c92c8cbf95f5c891df9 (diff) | |
bootchart: Support bootchart.conf.d directories in the usual search paths
Diffstat (limited to 'src/bootchart')
| -rw-r--r-- | src/bootchart/bootchart.c | 7 | ||||
| -rw-r--r-- | src/bootchart/bootchart.conf | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 5bb4247c8c..0808ba44ea 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -125,10 +125,9 @@ static void parse_conf(void) { { NULL, NULL, NULL, 0, NULL } }; - config_parse(NULL, BOOTCHART_CONF, NULL, - NULL, - config_item_table_lookup, items, - true, false, true, NULL); + config_parse_many(BOOTCHART_CONF, + CONF_DIRS_NULSTR("systemd/bootchart.conf"), + NULL, config_item_table_lookup, items, true, NULL); if (init != NULL) strscpy(arg_init_path, sizeof(arg_init_path), init); diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf index d7e0dabe09..c73328fde2 100644 --- a/src/bootchart/bootchart.conf +++ b/src/bootchart/bootchart.conf @@ -5,6 +5,9 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # +# You can override the directives in this file by creating files in +# /etc/systemd/bootchart.conf.d/*.conf. +# # See bootchart.conf(5) for details [Bootchart] |