diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
| commit | e3c4a681db0b7004904b95d55fd1a443161c9397 (patch) | |
| tree | a5b08abba6a533a3c4fc2a8f1bb9097957580c46 /src/bootchart/bootchart.c | |
| parent | 092b6e188b6b75be4450c6f20fc82599dcaf9552 (diff) | |
| parent | de7399eb7427da46c5cd355181080274f69567a2 (diff) | |
Merge pull request #1835 from poettering/grabbag-of-stuff
Lots of small fixes
Diffstat (limited to 'src/bootchart/bootchart.c')
| -rw-r--r-- | src/bootchart/bootchart.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 852febb225..6a0e1d6b14 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -95,8 +95,6 @@ static void signal_handler(int sig) { exiting = 1; } -#define BOOTCHART_CONF "/etc/systemd/bootchart.conf" - #define BOOTCHART_MAX (16*1024*1024) static void parse_conf(void) { @@ -117,8 +115,8 @@ static void parse_conf(void) { { NULL, NULL, NULL, 0, NULL } }; - config_parse_many(BOOTCHART_CONF, - CONF_DIRS_NULSTR("systemd/bootchart.conf"), + config_parse_many(PKGSYSCONFDIR "/bootchart.conf", + CONF_PATHS_NULSTR("systemd/bootchart.conf.d"), NULL, config_item_table_lookup, items, true, NULL); if (init != NULL) |