From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 9 Oct 2023 09:14:11 +0000 (+0200)
Subject: efi/boot: adjust grammar and punctuation in comments
X-Git-Tag: v255-rc1~256^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64381611871fc5cba9041eb10f4d64f34571293d;p=thirdparty%2Fsystemd.git

efi/boot: adjust grammar and punctuation in comments
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index e9a0060c33d..e9099a72841 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2389,7 +2389,8 @@ static EFI_STATUS image_start(
                 return log_error_status(err, "Error loading %ls: %m", entry->loader);
 
         /* DTBs are loaded by the kernel before ExitBootServices, and they can be used to map and assign
-         * arbitrary memory ranges, so skip it when secure boot is enabled as the DTB here is unverified. */
+         * arbitrary memory ranges, so skip them when secure boot is enabled as the DTB here is unverified.
+         */
         if (entry->devicetree && !secure_boot_enabled()) {
                 err = devicetree_install(&dtstate, image_root, entry->devicetree);
                 if (err != EFI_SUCCESS)
@@ -2406,8 +2407,8 @@ static EFI_STATUS image_start(
         if (err != EFI_SUCCESS)
                 return log_error_status(err, "Error getting LoadedImageProtocol handle: %m");
 
-        /* If we had to append an initrd= entry to the command line, we have to pass it, and measure
-         * it. Otherwise, only pass/measure it if it is not implicit anyway (i.e. embedded into the UKI or
+        /* If we had to append an initrd= entry to the command line, we have to pass it, and measure it.
+         * Otherwise, only pass/measure it if it is not implicit anyway (i.e. embedded into the UKI or
          * so). */
         char16_t *options = options_initrd ?: entry->options_implied ? NULL : entry->options;
         if (options) {
@@ -2544,8 +2545,8 @@ static EFI_STATUS secure_boot_discover_keys(Config *config, EFI_FILE *root_dir)
 
                 if (IN_SET(config->secure_boot_enroll, ENROLL_IF_SAFE, ENROLL_FORCE) &&
                     strcaseeq16(dirent->FileName, u"auto"))
-                        /* if we auto enroll successfully this call does not return, if it fails we still
-                         * want to add other potential entries to the menu */
+                        /* If we auto enroll successfully this call does not return.
+                         * If it fails we still want to add other potential entries to the menu. */
                         secure_boot_enroll_at(root_dir, entry->path, config->secure_boot_enroll == ENROLL_FORCE);
         }
 
@@ -2609,19 +2610,19 @@ static void config_load_all_entries(
 
         config_load_defaults(config, root_dir);
 
-        /* scan /EFI/Linux/ directory */
+        /* Scan /EFI/Linux/ directory */
         config_entry_add_unified(config, loaded_image->DeviceHandle, root_dir);
 
-        /* scan /loader/entries/\*.conf files */
+        /* Scan /loader/entries/\*.conf files */
         config_load_entries(config, loaded_image->DeviceHandle, root_dir, loaded_image_path);
 
         /* Similar, but on any XBOOTLDR partition */
         config_load_xbootldr(config, loaded_image->DeviceHandle);
 
-        /* sort entries after version number */
+        /* Sort entries after version number */
         sort_pointer_array((void **) config->entries, config->n_entries, (compare_pointer_func_t) config_entry_compare);
 
-        /* if we find some well-known loaders, add them to the end of the list */
+        /* If we find some well-known loaders, add them to the end of the list */
         config_entry_add_osx(config);
         config_entry_add_windows(config, loaded_image->DeviceHandle, root_dir);
         config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, NULL,
@@ -2665,10 +2666,10 @@ static void config_load_all_entries(
                 config_add_entry(config, entry);
         }
 
-        /* find if secure boot signing keys exist and autoload them if necessary
-        otherwise creates menu entries so that the user can load them manually
-        if the secure-boot-enroll variable is set to no (the default), we do not
-        even search for keys on the ESP */
+        /* Find secure boot signing keys and autoload them if configured.
+         * Otherwise, create menu entries so that the user can load them manually.
+         * If the secure-boot-enroll variable is set to no (the default), we do not
+         * even search for keys on the ESP */
         if (config->secure_boot_enroll != ENROLL_OFF)
                 secure_boot_discover_keys(config, root_dir);
 
@@ -2679,7 +2680,7 @@ static void config_load_all_entries(
 
         config_title_generate(config);
 
-        /* select entry by configured pattern or EFI LoaderDefaultEntry= variable */
+        /* Select entry by configured pattern or EFI LoaderDefaultEntry= variable */
         config_default_entry_select(config);
 }