From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 18 Aug 2022 13:15:14 +0000 (+0000)
Subject: Merge pull request #24054 from keszybz/initrd-no-reload
X-Git-Tag: v252-rc1~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd7ad0cbde507b9b43cf7e1797ce75e98345f4a0;p=thirdparty%2Fsystemd.git

Merge pull request #24054 from keszybz/initrd-no-reload

Don't do daemon-reload in the initrd
---

cd7ad0cbde507b9b43cf7e1797ce75e98345f4a0
diff --cc src/boot/bootctl.c
index f04463157a5,4907b3ce3de..10da1c8d7f2
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@@ -1838,14 -1784,14 +1838,17 @@@ static int verb_status(int argc, char *
                  bool have_bootloader_esp_uuid = efi_loader_get_device_part_uuid(&bootloader_esp_uuid) >= 0;
  
                  print_yes_no_line(false, have_bootloader_esp_uuid, "Boot loader sets ESP information");
-                 if (have_bootloader_esp_uuid && !sd_id128_equal(esp_uuid, bootloader_esp_uuid))
-                         printf("WARNING: The boot loader reports a different ESP UUID than detected!\n");
+                 if (have_bootloader_esp_uuid && !sd_id128_is_null(esp_uuid) &&
+                     !sd_id128_equal(esp_uuid, bootloader_esp_uuid))
+                         printf("WARNING: The boot loader reports a different ESP UUID than detected ("SD_ID128_UUID_FORMAT_STR" vs. "SD_ID128_UUID_FORMAT_STR")!\n",
+                                SD_ID128_FORMAT_VAL(bootloader_esp_uuid),
+                                SD_ID128_FORMAT_VAL(esp_uuid));
  
 -                if (stub)
 +                if (stub) {
                          printf("         Stub: %s\n", stub);
 +                        for (size_t i = 0; i < ELEMENTSOF(stub_flags); i++)
 +                                print_yes_no_line(i == 0, FLAGS_SET(stub_features, stub_flags[i].flag), stub_flags[i].name);
 +                }
                  if (!sd_id128_is_null(loader_part_uuid))
                          printf("          ESP: /dev/disk/by-partuuid/" SD_ID128_UUID_FORMAT_STR "\n",
                                 SD_ID128_FORMAT_VAL(loader_part_uuid));