picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootctl: show "n/a" for empty boot option labels

Browse source
This commit is contained in:
Kay Sievers 2013-02-17 22:28:21 +01:00
parent 7962afbba9
commit 71bf4f6f6c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/boot/boot-efi.c
View file

@ -75,7 +75,13 @@ static int get_boot_entries(struct boot_info *info) {
err = efi_get_boot_option(list[i], &e->title, &e->part_uuid, &e->path);
if (err < 0)
continue;
if (isempty(e->title)) {
free(e->title);
e->title = NULL;
}
tilt_slashes(e->path);
e->id = list[i];
info->fw_entries_count++;
}

4
src/boot/bootctl.c
View file

@ -149,7 +149,7 @@ 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))
@ -165,7 +165,7 @@ static int show_status(char **args, unsigned 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);
}