X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fboot%2Fbootctl.c;h=2a42898e39c0a261e2803e2932353ced5001bb7c;hb=ffa7cd15cd2a9e802827ef0f5762de6c22933c07;hp=641546bc082f87d3d046649e029ba90e74d4a16f;hpb=7b4d7cc08283e5485dcfa49ffdf1915de1d5e81b;p=elogind.git diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 641546bc0..2a42898e3 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -149,21 +149,23 @@ static int show_status(char **args, unsigned n) { printf(" Firmware: %s (%s)\n", info->fw_type, strna(info->fw_info)); if (info->fw_entry_active >= 0) { - printf("Firmware entry: %s\n", info->fw_entries[info->fw_entry_active].title); + printf("Firmware entry: %s\n", strna(info->fw_entries[info->fw_entry_active].title)); if (info->fw_entries[info->fw_entry_active].path) printf(" %s\n", info->fw_entries[info->fw_entry_active].path); if (!sd_id128_equal(info->fw_entries[info->fw_entry_active].part_uuid, SD_ID128_NULL)) - printf(" %s\n", sd_id128_to_string(info->fw_entries[info->fw_entry_active].part_uuid, buf)); + printf(" /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n", + SD_ID128_FORMAT_VAL(info->fw_entries[info->fw_entry_active].part_uuid)); } if (info->loader) { printf(" Loader: %s\n", info->loader); printf(" %s\n", strna(info->loader_image_path)); if (!sd_id128_equal(info->loader_part_uuid, SD_ID128_NULL)) - printf(" %s\n", sd_id128_to_string(info->loader_part_uuid, buf)); + printf(" /dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n", + SD_ID128_FORMAT_VAL(info->loader_part_uuid)); if (info->loader_entry_active >= 0) { - printf(" Loader entry: %s\n", info->loader_entries[info->loader_entry_active].title); + printf(" Loader entry: %s\n", strna(info->loader_entries[info->loader_entry_active].title)); printf(" %s\n", info->loader_entries[info->loader_entry_active].path); }