From db3e0393ea31884d3b320f3af294f94e1fafe764 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Fri, 21 Feb 2025 14:17:57 +0100 Subject: [PATCH] udev-builtin-blkid: merge var definitions, fix grammar Follow-up for f8825c1364fb1c3f3f5d96654e779fd51500f476 --- src/udev/udev-builtin-blkid.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 6fdd6c1044e..e15c97903ef 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -129,10 +129,9 @@ static int find_gpt_root(UdevEvent *event, blkid_probe pr, const char *loop_back #if defined(SD_GPT_ROOT_NATIVE) && ENABLE_EFI sd_device *dev = ASSERT_PTR(ASSERT_PTR(event)->dev); - sd_id128_t esp_or_xbootldr = SD_ID128_NULL; _cleanup_free_ char *root_label = NULL; bool found_esp_or_xbootldr = false, need_esp_or_xbootldr; - sd_id128_t root_id = SD_ID128_NULL; + sd_id128_t root_id = SD_ID128_NULL, esp_or_xbootldr = SD_ID128_NULL; int r; assert(event); @@ -154,7 +153,7 @@ static int find_gpt_root(UdevEvent *event, blkid_probe pr, const char *loop_back if (r != -ENOENT && !ERRNO_IS_NOT_SUPPORTED(r)) return log_debug_errno(r, "Unable to determine loader partition UUID: %m"); - log_device_debug(dev, "No loader partition UUID EFI variable set, not using partition data for search for default root block device."); + log_device_debug(dev, "No loader partition UUID EFI variable set, not using partition data to search for default root block device."); /* NB: if an ESP/xbootldr field is set, we always use that. We do this in order to guarantee * systematic behaviour. */ -- 2.47.3