shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

Merge pull request #20992 from keszybz/fix-two-outputs

Browse Source 
Fix two outputs
This commit is contained in:
Yu Watanabe 2021-10-13 11:12:26 +09:00 committed by GitHub
commit c2e22d73ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/coredump/coredumpctl.c
View File

@ -563,6 +563,8 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
assert(file);
assert(j);
(void) sd_journal_set_data_threshold(j, 0);
SD_JOURNAL_FOREACH_DATA(j, d, l) {
RETRIEVE(d, l, "MESSAGE_ID", mid);
RETRIEVE(d, l, "COREDUMP_PID", pid);

2
src/shared/dissect-image.c
View File

@ -546,7 +546,7 @@ static int device_wait_for_initialization_harder(
(void) sd_device_get_sysname(device, &sn);
log_device_debug(device,
"Waiting for device '%s' to initialize for %s.", strna(sn), FORMAT_TIMESPAN(left, 0));
"Will wait up to %s for '%s' to initialize…", FORMAT_TIMESPAN(left, 0), strna(sn));
}
if (left != USEC_INFINITY)