dcavalca / rpms / systemd

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