From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 14 Feb 2025 08:42:43 +0000 (+0100)
Subject: bootctl: stop printing "Stub/Boot loader set partition information"
X-Git-Tag: v258-rc1~1028^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f25e4e5af0518b4865eff84b65dd339047e429ed;p=thirdparty%2Fsystemd.git

bootctl: stop printing "Stub/Boot loader set partition information"

... and "Stub/Boot loader set network boot URL information".

This reverts 26bfd97216ab55664214d1e0fac7065e5573a36b
('bootctl: also shown whether stub loader partition data was passed'),
and one line from bfcf48b842644c1016583ecf0c4258cb59a102bb
('bootctl: show stub partition data too in "status" too'),
and two lines from e15d18b4c64e13c37a4c676bf61a5ecf8bba04a3
('sd-stub: if we are http booted, query source URL and write to EFI variable').

As discussed in https://github.com/systemd/systemd/pull/36372, those are not
"features", but optional pieces of information that may or may not be set, also
depending on how the boot loader and stub were loaded. We already prominently
show this information right below: either we print the device path or "n/a" or
skip the output. The user already has all the information, and the status
output should be dense, so it doesn't make sense to repeat this twice.

               ✓ Boot loader set partition information
    Partition: /dev/disk/by-partuuid/3f003ec5-5673-5b4f-b9a4-cbac1ca4461a
OR
               - Boot loader set partition information
    Partition: n/a

               ✓ Stub loader set partition information
    Partition: /dev/disk/by-partuuid/3f003ec5-5673-5b4f-b9a4-cbac1ca4461a
OR
               - Stub loader set partition information
    Partition: n/a
---

diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c
index 798c86dba29..a15075e1c90 100644
--- a/src/bootctl/bootctl-status.c
+++ b/src/bootctl/bootctl-status.c
@@ -482,11 +482,9 @@ int verb_status(int argc, char *argv[], void *userdata) {
 
                         sd_id128_t loader_partition_uuid = SD_ID128_NULL;
                         (void) efi_loader_get_device_part_uuid(&loader_partition_uuid);
-                        print_yes_no_line(/* first= */ false, !sd_id128_is_null(loader_partition_uuid), "Boot loader set partition information");
 
                         _cleanup_free_ char *loader_url = NULL;
                         (void) efi_get_variable_string_and_warn(EFI_LOADER_VARIABLE_STR("LoaderDeviceURL"), &loader_url);
-                        print_yes_no_line(/* first= */ false, !!loader_url, "Boot loader set network boot URL information");
 
                         if (!sd_id128_is_null(loader_partition_uuid)) {
                                 if (!sd_id128_is_null(esp_uuid) && !sd_id128_equal(esp_uuid, loader_partition_uuid))
@@ -522,11 +520,9 @@ int verb_status(int argc, char *argv[], void *userdata) {
 
                         sd_id128_t stub_partition_uuid = SD_ID128_NULL;
                         (void) efi_stub_get_device_part_uuid(&stub_partition_uuid);
-                        print_yes_no_line(/* first= */ false, !sd_id128_is_null(stub_partition_uuid), "Stub loader set partition information");
 
                         _cleanup_free_ char *stub_url = NULL;
                         (void) efi_get_variable_string_and_warn(EFI_LOADER_VARIABLE_STR("StubDeviceURL"), &stub_url);
-                        print_yes_no_line(/* first= */ false, !!stub_url, "Stub set network boot URL information");
 
                         if (!sd_id128_is_null(stub_partition_uuid)) {
                                 if (!(!sd_id128_is_null(esp_uuid) && sd_id128_equal(esp_uuid, stub_partition_uuid)) &&