bootchart: Support bootchart.conf.d directories in the usual search paths

This commit is contained in:
Josh Triplett
2014-11-29 13:55:32 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 778b6a3f88
commit 396f9e2b32
4 changed files with 25 additions and 12 deletions
+3 -4
View File
@@ -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);
+3
View File
@@ -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]