]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootctl: tweak status output when operating on --image= files 36727/head
authorLennart Poettering <lennart@poettering.net>
Wed, 12 Mar 2025 20:59:49 +0000 (21:59 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 13 Mar 2025 09:49:53 +0000 (10:49 +0100)
Let's not claim the system was not booted with UEFI if we use --image=.
The system wasn't booted at all, after all. Hence supress the whole
section altogether in this case.

src/bootctl/bootctl-status.c

index 798c86dba292fdb4eeb0feda073ba3765807370e..bf29a9576014a92f3ec1cd722c6951099acfd1d8 100644 (file)
@@ -370,7 +370,13 @@ int verb_status(int argc, char *argv[], void *userdata) {
 
         pager_open(arg_pager_flags);
 
-        if (!arg_root && is_efi_boot()) {
+        if (arg_root)
+                log_debug("Skipping 'System' section, operating offline.");
+        else if (!is_efi_boot())
+                printf("%sSystem:%s\n"
+                       "Not booted with EFI\n\n",
+                       ansi_underline(), ansi_normal());
+        else {
                 static const struct {
                         uint64_t flag;
                         const char *name;
@@ -567,10 +573,7 @@ int verb_status(int argc, char *argv[], void *userdata) {
                 }
 
                 printf("\n");
-        } else
-                printf("%sSystem:%s\n"
-                       "Not booted with EFI\n\n",
-                       ansi_underline(), ansi_normal());
+        }
 
         if (arg_esp_path)
                 RET_GATHER(r, status_binaries(arg_esp_path, esp_uuid));