chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update TODO
[elogind.git]
/
src
/
bootchart
/
bootchart.c
diff --git
a/src/bootchart/bootchart.c
b/src/bootchart/bootchart.c
index 35c15ab12e3d48aab4e89de399ba86f1c084878c..0808ba44ea17d401872dd94bd8aca6df009a4ed1 100644
(file)
--- a/
src/bootchart/bootchart.c
+++ b/
src/bootchart/bootchart.c
@@
-125,10
+125,9
@@
static void parse_conf(void) {
{ NULL, NULL, NULL, 0, NULL }
};
{ 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);
if (init != NULL)
strscpy(arg_init_path, sizeof(arg_init_path), init);
@@
-285,7
+284,7
@@
static void do_journal_append(char *file) {
f = open(file, O_RDONLY|O_CLOEXEC);
if (f < 0) {
f = open(file, O_RDONLY|O_CLOEXEC);
if (f < 0) {
- log_error
(
"Failed to read bootchart data: %m");
+ log_error
_errno(errno,
"Failed to read bootchart data: %m");
return;
}
n = loop_read(f, p + 10, BOOTCHART_MAX, false);
return;
}
n = loop_read(f, p + 10, BOOTCHART_MAX, false);
@@
-434,7
+433,7
@@
int main(int argc, char *argv[]) {
/* caught signal, probably HUP! */
break;
}
/* caught signal, probably HUP! */
break;
}
- log_error
(
"nanosleep() failed: %m");
+ log_error
_errno(errno,
"nanosleep() failed: %m");
exit(EXIT_FAILURE);
}
} else {
exit(EXIT_FAILURE);
}
} else {