|
 |
803fb7 |
From 046d996001c0b3fe34d34683e55f62481a5af932 Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: Jan Synacek <jsynacek@redhat.com>
|
|
|
803fb7 |
Date: Mon, 1 Feb 2016 09:29:02 +0100
|
|
|
803fb7 |
Subject: [PATCH] journalctl: improve error messages when the specified boot is
|
|
|
803fb7 |
not found
|
|
|
803fb7 |
|
|
|
803fb7 |
Cherry-picked from: c34e939909710bf124e7741c3648592a30418ffd
|
|
|
803fb7 |
Resolves: #1082179
|
|
|
803fb7 |
---
|
|
|
803fb7 |
src/journal/journalctl.c | 7 ++++---
|
|
|
803fb7 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
|
|
|
803fb7 |
index 7058788ef..964f849ee 100644
|
|
|
803fb7 |
--- a/src/journal/journalctl.c
|
|
|
803fb7 |
+++ b/src/journal/journalctl.c
|
|
|
803fb7 |
@@ -1090,10 +1090,11 @@ static int add_boot(sd_journal *j) {
|
|
|
803fb7 |
const char *reason = (r == 0) ? "No such boot ID in journal" : strerror(-r);
|
|
|
803fb7 |
|
|
|
803fb7 |
if (sd_id128_is_null(arg_boot_id))
|
|
|
803fb7 |
- log_error("Failed to look up boot %+i: %s", arg_boot_offset, reason);
|
|
|
803fb7 |
+ log_error("Data from the specified boot (%+i) is not available: %s",
|
|
|
803fb7 |
+ arg_boot_offset, reason);
|
|
|
803fb7 |
else
|
|
|
803fb7 |
- log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s",
|
|
|
803fb7 |
- SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, reason);
|
|
|
803fb7 |
+ log_error("Data from the specified boot ("SD_ID128_FORMAT_STR") is not available: %s",
|
|
|
803fb7 |
+ SD_ID128_FORMAT_VAL(arg_boot_id), reason);
|
|
|
803fb7 |
|
|
|
803fb7 |
return r == 0 ? -ENODATA : r;
|
|
|
803fb7 |
}
|