shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

coredump: clamp JournalSizeMax= to maximum journald would accept

Browse Source 
See: #26748
This commit is contained in:
Lennart Poettering 2023-06-22 17:11:00 +02:00
parent a73c74db66
commit 4a78074fc1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/coredump/coredump.c
View File

@ -172,9 +172,27 @@ static int parse_config(void) {
{}
};
return config_parse_config_file("coredump.conf", "Coredump\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN, NULL);
int r;
r = config_parse_config_file(
"coredump.conf",
"Coredump\0",
config_item_table_lookup,
items,
CONFIG_PARSE_WARN,
/* userdata= */ NULL);
if (r < 0)
return r;
/* Let's make sure we fix up the maximum size we send to the journal here on the client side, for
* efficiency reasons. journald wouldn't accept anything larger anyway. */
if (arg_journal_size_max > JOURNAL_SIZE_MAX) {
log_warning("JournalSizeMax= set to larger value (%s) than journald would accept (%s), lowering automatically.",
FORMAT_BYTES(arg_journal_size_max), FORMAT_BYTES(JOURNAL_SIZE_MAX));
arg_journal_size_max = JOURNAL_SIZE_MAX;
}
return 0;
}
static uint64_t storage_size_max(void) {