34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From 29180c67635d3a6e4d5fd340ff9251724c803a65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Sun, 13 Nov 2022 14:36:01 +0900
|
||
|
|
Subject: [PATCH] bootctl: make boot entry id logged in hex
|
||
|
|
|
||
|
|
To make consistent with the printed boot id below and other tools e.g.
|
||
|
|
efibootmgr.
|
||
|
|
|
||
|
|
(cherry picked from commit a7dcb75c539dd5bb69b72e47c820fe79c794409a)
|
||
|
|
|
||
|
|
Related: #2138081
|
||
|
|
---
|
||
|
|
src/boot/bootctl.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
|
||
|
|
index b53df11764..64a4b74715 100644
|
||
|
|
--- a/src/boot/bootctl.c
|
||
|
|
+++ b/src/boot/bootctl.c
|
||
|
|
@@ -586,11 +586,11 @@ static int print_efi_option(uint16_t id, int *n_printed, bool in_order) {
|
||
|
|
|
||
|
|
r = efi_get_boot_option(id, &title, &partition, &path, &active);
|
||
|
|
if (r < 0)
|
||
|
|
- return log_error_errno(r, "Failed to read boot option %u: %m", id);
|
||
|
|
+ return log_error_errno(r, "Failed to read boot option 0x%04X: %m", id);
|
||
|
|
|
||
|
|
/* print only configured entries with partition information */
|
||
|
|
if (!path || sd_id128_is_null(partition)) {
|
||
|
|
- log_debug("Ignoring boot entry %u without partition information.", id);
|
||
|
|
+ log_debug("Ignoring boot entry 0x%04X without partition information.", id);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|